drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,069 Commits 1 Branch 0 Tags
Commit Graph

278069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FEI WU
13000bebe1 Update colorPrimary in watch am: 9072dcd82c 
am: 78fef4c065

Change-Id: I586f1de9d0d8c3860807c3209dba4758e3bd4701
 2016-11-16 21:24:23 +00:00
FEI WU
78fef4c065 Update colorPrimary in watch 
am: 9072dcd82c

Change-Id: I3a869e0acddb6d0494e352bfb7e926e897105f08
 2016-11-16 21:15:38 +00:00
Yifan Hong
7ae2aa4ed9 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d am: 2f7a3f9595 
am: afe46992b8

Change-Id: If9b589ef262ae97e85dc851bd1a5f3fe3d4c22fa
 2016-11-16 19:24:09 +00:00
Yifan Hong
afe46992b8 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d 
am: 2f7a3f9595

Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5
 2016-11-16 19:16:45 +00:00
Yifan Hong
2f7a3f9595 Merge "Fix include after spliting HidlSupport.h" 
am: efd7b9f57d

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
 2016-11-16 19:10:20 +00:00
Yifan Hong
efd7b9f57d Merge "Fix include after spliting HidlSupport.h" 2016-11-16 19:01:00 +00:00
Andreas Gampe
c89bd30cee Merge "Preload2: Fix dependencies" am: 3b379ee94e am: 74b4e070be 
am: 6a454c86db

Change-Id: Id214d7386401495981a75acb5a7b4a91a220e6a6
 2016-11-16 18:40:08 +00:00
Andreas Gampe
6a454c86db Merge "Preload2: Fix dependencies" am: 3b379ee94e 
am: 74b4e070be

Change-Id: I6bbc33352648a352ed8be54bb3cb2eb9e065f074
 2016-11-16 18:32:56 +00:00
Andreas Gampe
74b4e070be Merge "Preload2: Fix dependencies" 
am: 3b379ee94e

Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
 2016-11-16 18:25:37 +00:00
Treehugger Robot
3b379ee94e Merge "Preload2: Fix dependencies" 2016-11-16 18:15:06 +00:00
Martijn Coenen
f4a0f12eb7 Merge "Fix deprecated range_x calls." am: 87cafe8f33 am: d03b17c29a 
am: 6e2c276c78

Change-Id: I6511ef9ccc352c43c7fa5924e1246449be7c3a0e
 2016-11-16 10:19:30 +00:00
Martijn Coenen
6e2c276c78 Merge "Fix deprecated range_x calls." am: 87cafe8f33 
am: d03b17c29a

Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38
 2016-11-16 10:07:54 +00:00
Martijn Coenen
d03b17c29a Merge "Fix deprecated range_x calls." 
am: 87cafe8f33

Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
 2016-11-16 10:00:23 +00:00
Martijn Coenen
87cafe8f33 Merge "Fix deprecated range_x calls." 2016-11-16 09:48:31 +00:00
Hidenari Koshimae
2b08faf2cc Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa am: 9997fcc72c 
am: 9f0cc266ce

Change-Id: I75127bfd0fc4ce9256c775eaeb46582afd637e8d
 2016-11-16 08:26:00 +00:00
Hidenari Koshimae
9f0cc266ce Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa 
am: 9997fcc72c

Change-Id: Ie09949fbc23ad87e159e063a59983a1a6bff98f8
 2016-11-16 08:18:30 +00:00
Hidenari Koshimae
9997fcc72c Merge "CountDownTimer: not skip onTick()" 
am: 224d9e48fa

Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
 2016-11-16 08:10:54 +00:00
Treehugger Robot
224d9e48fa Merge "CountDownTimer: not skip onTick()" 2016-11-16 07:55:27 +00:00
longhai
d7e2ae5fc7 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72 
am: 5c152a3d7f

Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
 2016-11-16 03:18:08 +00:00
longhai
5c152a3d7f Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 
am: 2be54fde72

Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
 2016-11-16 03:11:09 +00:00
longhai
2be54fde72 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
 2016-11-16 03:04:38 +00:00
Treehugger Robot
1813ae0159 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 2016-11-16 02:54:26 +00:00
Peter Qiu
0fc7044d0b Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 
am: 2e73b06f63

Change-Id: I0be82ec64a61f015a34ded70202c422e43825778
 2016-11-16 00:29:39 +00:00
Peter Qiu
03e4bc1ead wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 
am: 134706940b

Change-Id: If04a8f9005b69b9f4f38c2e0ea38b7bc6162397e
 2016-11-16 00:27:34 +00:00
Peter Qiu
996986254f wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d 
am: 31b8e658d3

Change-Id: Ifce7abfb578e5b7d0a3d5c964926537e16ef3a2b
 2016-11-16 00:26:28 +00:00
Peter Qiu
2e73b06f63 Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf 
am: afb8f37711

Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
 2016-11-16 00:18:36 +00:00
Peter Qiu
134706940b wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 
am: 1b39c61ce7

Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
 2016-11-16 00:16:30 +00:00
Peter Qiu
31b8e658d3 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 
am: a9a9a9bb8d

Change-Id: I5be1220539e5a22e4f0d4e3d52ac85c608ccb950
 2016-11-16 00:14:46 +00:00
Peter Qiu
afb8f37711 Merge changes from topic 'HS2 API Cleanup' 
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
 2016-11-16 00:04:44 +00:00
Yifan Hong
ddf31f604e Fix include after spliting HidlSupport.h 
Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
 2016-11-15 16:02:40 -08:00
Peter Qiu
1b39c61ce7 wifi: remove unused hidden Hotspot 2.0 Release 1 API 
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
 2016-11-16 00:00:06 +00:00
Peter Qiu
a9a9a9bb8d wifi: remove hidden unused Hotspot 2.0 Release 2 APIs 
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
 2016-11-15 23:59:20 +00:00
Treehugger Robot
41fd0f1faf Merge changes from topic 'HS2 API Cleanup' 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
 2016-11-15 23:50:18 +00:00
Selim Gurun
ffa68753f8 Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev 
am: 83fbb94e18

Change-Id: I6b7b1e04b00835ad2fde2d6d6b4b0dd6f3f81425
 2016-11-15 20:15:24 +00:00
Hui Shu
1eb8a07e1b Fix WebViewDatabase javadoc. 
am: 68d2cc180f

Change-Id: I811966bc364697f5c172cd9b4153d963962d8db2
 2016-11-15 20:15:17 +00:00
Selim Gurun
83fbb94e18 Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev 2016-11-15 19:57:42 +00:00
Neil Fuller
9103632f9d Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980 
am: ef34053f26

Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf
 2016-11-15 17:04:37 +00:00
Neil Fuller
ef34053f26 Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
 2016-11-15 16:57:32 +00:00
Neil Fuller
98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting" 
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
 2016-11-15 16:50:29 +00:00
Neil Fuller
8631e19d38 Merge "Correctly handle when the user has no explicit time_12_24 setting" 2016-11-15 16:39:42 +00:00
Julia Reynolds
a167322e66 Merge "Remove 'until next alarm'." into nyc-mr2-dev 
am: fd5f6e9446

Change-Id: I9cfa68615af9415265955d62a924d8fb9ddb2d80
 2016-11-15 14:13:23 +00:00
Julia Reynolds
177a976a69 Remove 'until next alarm'. 
am: 5edde5f18a

Change-Id: I0f247f52155f78cefe0d2e850e9d5f1ca65dfb42
 2016-11-15 14:13:18 +00:00
Julia Reynolds
fd5f6e9446 Merge "Remove 'until next alarm'." into nyc-mr2-dev 2016-11-15 14:06:39 +00:00
Martijn Coenen
90213f341d Fix deprecated range_x calls. 
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
 2016-11-15 09:07:12 +01:00
Peter Qiu
6966f450a2 Merge "osu: remove calls to deprecated APIs" am: e9514808d7 am: 30874ed6ed 
am: 0a5b88e286

Change-Id: Ifb54b8061a70851a8989fae30466f87822e05943
 2016-11-15 04:30:20 +00:00
Peter Qiu
0a5b88e286 Merge "osu: remove calls to deprecated APIs" am: e9514808d7 
am: 30874ed6ed

Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239
 2016-11-15 04:23:21 +00:00
Peter Qiu
30874ed6ed Merge "osu: remove calls to deprecated APIs" 
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
 2016-11-15 04:15:59 +00:00
Treehugger Robot
e9514808d7 Merge "osu: remove calls to deprecated APIs" 2016-11-15 03:59:57 +00:00
Svetoslav Ganov
a30eb89ead Merge "Add WiFi toggle prompts - framework" into stage-aosp-master am: 9f078049cf 
am: 05149e69cb

Change-Id: Ib284befe74e6bca8b3c75e5c33dec1ba23eab898
 2016-11-15 03:41:14 +00:00
Svetoslav Ganov
afb49d395e Add WiFi toggle prompts - framework am: 6c3032f16b 
am: 23328d9714

Change-Id: I629311080b90402a3919dcd3c7b49291800a398b
 2016-11-15 03:40:16 +00:00