Raphael Moll
18ec7c4f8a
resolved conflicts for merge of 566a4694 to klp-modular-dev
...
Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26
2014-08-22 11:26:33 -07:00
Raphael Moll
566a46941e
am 76c7aa35: Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
...
* commit '76c7aa353666479df9545a66f3f49eb8ff69a86e':
Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
2014-08-22 16:53:16 +00:00
Stephen Hines
73ae6d9f02
Fix RS samples to prepare for 64-bit compilation.
...
Bug: 16031597
Change-Id: I8f79773e4d5219d3c8dc4696176cd42f8236c87b
(cherry picked from commit d8295c9e49 )
2014-08-22 01:16:21 -07:00
Raphael Moll
76c7aa3536
Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
...
Change-Id: I140d043086c8da434a8b6bf16cfb3c3763e2ba89
2014-08-22 04:28:39 +00:00
Dianne Hackborn
9f744759d1
Work on issue #17011123 : Hit Back/Recents button when in Recents...
...
...without interacting with any of the Recents items should not
bring Home back to top
Add API demo for nav bar navigation.
Change-Id: I8b45f2bc0b554da19957ad723abe7cf4a14ee5a1
2014-08-21 17:58:05 -07:00
Stephen Hines
a9d1cd0d32
am d6a790cd: Merge "Fix RS samples to prepare for 64-bit compilation." into lmp-dev
...
* commit 'd6a790cdfef3aa0c16264c6a2c37e0164dde8d04':
Fix RS samples to prepare for 64-bit compilation.
2014-08-21 22:13:21 +00:00
Stephen Hines
d6a790cdfe
Merge "Fix RS samples to prepare for 64-bit compilation." into lmp-dev
2014-08-21 21:49:56 +00:00
Craig Stout
a58523591c
am 311be185: Demonstrate OnItemClicked/Selected listeners.
...
* commit '311be185b2a1223c5936429c3f22ad4ad6fcdd56':
Demonstrate OnItemClicked/Selected listeners.
2014-08-21 20:31:50 +00:00
Craig Stout
311be185b2
Demonstrate OnItemClicked/Selected listeners.
...
Also fixes broken VerticalGridFragment.
And cleanup.
b/16354712
Change-Id: I348ab42230d88bac8192b5421e76a58b28ca6616
2014-08-20 18:26:44 -07:00
Tom Taylor
0dcc306dff
am f1c2891a: Merge "MMS API: ApiDemos demo app" into lmp-dev
...
* commit 'f1c2891a0029cca137ba3b7802e75e21d500788c':
MMS API: ApiDemos demo app
2014-08-20 19:21:58 +00:00
Tom Taylor
f1c2891a00
Merge "MMS API: ApiDemos demo app" into lmp-dev
2014-08-20 18:43:12 +00:00
Dake Gu
efac7ff378
am 17b507bd: Merge "Make BrowseAnimationFragment working" into lmp-dev
...
* commit '17b507bd0c1c4a999124b3d2ff81411fc879e13f':
Make BrowseAnimationFragment working
2014-08-19 21:07:50 +00:00
Craig Stout
7dd382febc
am 114c29f2: Merge "Cleanup playback controls sample." into lmp-dev
...
* commit '114c29f2276cc0eda6542eed46336df35e2a66fc':
Cleanup playback controls sample.
2014-08-19 17:53:37 +00:00
Ying Wang
639e4bc61f
am 67f00d44: am 7ec230ea: Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree."
...
* commit '67f00d4487575c5690f1939289665caa79aa3120':
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
2014-08-19 17:07:48 +00:00
Ying Wang
67f00d4487
am 7ec230ea: Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree."
...
* commit '7ec230eaf2a35e98bdb28da92feecf7476eb0a33':
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
2014-08-19 17:01:50 +00:00
Ying Wang
5092d393b5
am e522c95f: Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
...
* commit 'e522c95f8f76277624e6758864501c4ad4a167d2':
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
2014-08-19 16:48:49 +00:00
Ying Wang
7ec230eaf2
Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree."
2014-08-19 15:49:56 +00:00
Ying Wang
00b44e517b
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
...
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
2014-08-19 09:33:45 -07:00
Dake Gu
17b507bd0c
Merge "Make BrowseAnimationFragment working" into lmp-dev
2014-08-18 21:31:41 +00:00
Dake Gu
f2204d4af7
Make BrowseAnimationFragment working
...
Change-Id: Id239c1910783bb70cbffcba71a5832a15db58e39
2014-08-18 16:14:50 -07:00
Craig Stout
114c29f227
Merge "Cleanup playback controls sample." into lmp-dev
2014-08-18 21:31:41 +00:00
Craig Stout
a569a89812
Cleanup playback controls sample.
...
Change-Id: Ib8e054001bb95a4b92acb8a2331a9544ec88e669
2014-08-18 14:24:39 -07:00
Ying Wang
e522c95f8f
Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
...
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
2014-08-18 10:46:21 -07:00
anaddaf
162b1b9017
am 4d0cd671: am 76f5fe77: am d97ecae3: Upating the "date" content of notifications to include seconds
...
* commit '4d0cd671d17a0b2b65609de12a120887a6d2442a':
Upating the "date" content of notifications to include seconds
2014-08-16 04:19:53 +00:00
anaddaf
4d0cd671d1
am 76f5fe77: am d97ecae3: Upating the "date" content of notifications to include seconds
...
* commit '76f5fe77d2e53e245ee9d811152cf2333604db63':
Upating the "date" content of notifications to include seconds
2014-08-16 03:59:50 +00:00
anaddaf
76f5fe77d2
am d97ecae3: Upating the "date" content of notifications to include seconds
...
* commit 'd97ecae3db7b06238e215f6cde15b1bfee658a02':
Upating the "date" content of notifications to include seconds
2014-08-15 22:00:41 +00:00
anaddaf
d97ecae3db
Upating the "date" content of notifications to include seconds
...
Including "seconds" in the content of notifications to enables fast
creation/update of notifications; previously, the watch-only ones
could be created once every minute.
Bug: 16898049
Change-Id: Idd7a5b78d4cc948d4c8b3862fd998a91044d6007
2014-08-15 09:46:44 -07:00
Naoki Ishihara
107dd07801
am a34adbb2: am 31a7dc41: am 340f9ee6: am 897d76c8: Adding browsable prebuilt samples for August push
...
* commit 'a34adbb219ef7a246f183ec8c5223c22c8094639':
Adding browsable prebuilt samples for August push
2014-08-15 11:48:13 +00:00
Naoki Ishihara
96b22f426c
am 2efe0cf3: am fa00c4f4: am 096d3f77: am 89230cf8: am 56d2cb15: Adding browsable prebuilt samples for August push
...
* commit '2efe0cf369f2bf61440c4a27b2b43a82302d47d9':
Adding browsable prebuilt samples for August push
2014-08-15 11:48:11 +00:00
Stephen Hines
d8295c9e49
Fix RS samples to prepare for 64-bit compilation.
...
Bug: 16031597
Change-Id: I8f79773e4d5219d3c8dc4696176cd42f8236c87b
2014-08-15 02:18:22 -07:00
Naoki Ishihara
a34adbb219
am 31a7dc41: am 340f9ee6: am 897d76c8: Adding browsable prebuilt samples for August push
...
* commit '31a7dc411e2802e1946f801a60d76a3823c504f7':
Adding browsable prebuilt samples for August push
2014-08-14 22:42:46 +00:00
Naoki Ishihara
31a7dc411e
am 340f9ee6: am 897d76c8: Adding browsable prebuilt samples for August push
...
* commit '340f9ee6445dae5f00edf933728faa17e2ad57d3':
Adding browsable prebuilt samples for August push
2014-08-14 22:39:23 +00:00
Naoki Ishihara
2efe0cf369
am fa00c4f4: am 096d3f77: am 89230cf8: am 56d2cb15: Adding browsable prebuilt samples for August push
...
* commit 'fa00c4f4fdccaec1391dd2ac3cc3a1a65412c1ef':
Adding browsable prebuilt samples for August push
2014-08-14 22:39:07 +00:00
Naoki Ishihara
340f9ee644
am 897d76c8: Adding browsable prebuilt samples for August push
...
* commit '897d76c8a5a3674fb494794b50721697cfbd2c20':
Adding browsable prebuilt samples for August push
2014-08-14 22:34:58 +00:00
Naoki Ishihara
fa00c4f4fd
am 096d3f77: am 89230cf8: am 56d2cb15: Adding browsable prebuilt samples for August push
...
* commit '096d3f7723e5b7c02b10c02dd6f05771cf9824e7':
Adding browsable prebuilt samples for August push
2014-08-14 22:34:37 +00:00
Naoki Ishihara
096d3f7723
am 89230cf8: am 56d2cb15: Adding browsable prebuilt samples for August push
...
* commit '89230cf8482c5c67e7fea4f87a1e31ecfc4375f7':
Adding browsable prebuilt samples for August push
2014-08-14 22:32:16 +00:00
Naoki Ishihara
89230cf848
am 56d2cb15: Adding browsable prebuilt samples for August push
...
* commit '56d2cb15b332fc44ccd755693a644c007e616dc4':
Adding browsable prebuilt samples for August push
2014-08-14 22:29:04 +00:00
Naoki Ishihara
897d76c8a5
Adding browsable prebuilt samples for August push
...
Change-Id: I7b10e94da639ad0e304abd2507c66265073d2398
2014-08-14 22:23:08 +00:00
Naoki Ishihara
56d2cb15b3
Adding browsable prebuilt samples for August push
...
Change-Id: I7b10e94da639ad0e304abd2507c66265073d2398
2014-08-14 15:16:04 -07:00
Santos Cordon
e08fcac895
am c77d6680: Merge "Rename framework-base to framework in classpath." into lmp-dev
...
* commit 'c77d66804da50a92f94d88048446ca1dc7de70c2':
Rename framework-base to framework in classpath.
2014-08-13 00:11:22 +00:00
Santos Cordon
c77d66804d
Merge "Rename framework-base to framework in classpath." into lmp-dev
2014-08-12 23:14:35 +00:00
Santos Cordon
11b9213ec5
Rename framework-base to framework in classpath.
...
Change-Id: Ie114c2624cbf1c3bbb4519832cd50568f662fa80
2014-08-12 16:58:06 -07:00
Mark Renouf
87836a71a0
am 98b567b5: am 19f8a686: am 35b1a50a: Explicitly call onApplyWindowInsets from a listener
...
* commit '98b567b59730c6503a75497802ccdd818bd05632':
Explicitly call onApplyWindowInsets from a listener
2014-08-12 20:48:52 +00:00
Mark Renouf
98b567b597
am 19f8a686: am 35b1a50a: Explicitly call onApplyWindowInsets from a listener
...
* commit '19f8a686d19c3ba4f994671d9fefc5e9f5dc25b8':
Explicitly call onApplyWindowInsets from a listener
2014-08-12 20:38:31 +00:00
Mark Renouf
19f8a686d1
am 35b1a50a: Explicitly call onApplyWindowInsets from a listener
...
* commit '35b1a50abda7476f6c329b922e1b55a26cae5db6':
Explicitly call onApplyWindowInsets from a listener
2014-08-12 20:35:22 +00:00
Jim Miller
b38072a7a5
am d6df7362: Add test options for DPM.setTrustAgentFeaturesEnabled()
...
* commit 'd6df7362ab4b332a09d12358297056cfeadcaa11':
Add test options for DPM.setTrustAgentFeaturesEnabled()
2014-08-12 00:53:06 +00:00
Jim Miller
d6df7362ab
Add test options for DPM.setTrustAgentFeaturesEnabled()
...
Also fixes bug where DPM flags were set in onPreferenceChanged()
which happened before being set on the checkbox preference.
Change-Id: I5a43358d02830a22107f1239c596cc1bc67d11a1
2014-08-11 17:43:27 -07:00
Craig Stout
0b4b660d9f
am 382695a8: Merge "Fix build." into lmp-dev
...
* commit '382695a8f6136637b28576e17ee56e3a084a4320':
Fix build.
2014-08-11 17:23:50 +00:00
Craig Stout
382695a8f6
Merge "Fix build." into lmp-dev
2014-08-11 17:09:08 +00:00
Craig Stout
2697525ad0
Fix build.
...
Change-Id: Ia71c0866e120bb772fbdc3db12bf34024a8a8d0d
2014-08-11 10:14:41 -07:00