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

2695 Commits

Author SHA1 Message Date
John Spurlock
c787555c36 am 6f002333: am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '6f002333c30d98c4c51b2217dae4bcd05f8a36f3':
  Saver: PowerManager call to set low power mode.
 2014-09-14 20:21:36 +00:00
John Spurlock
b9e2fe1d4a am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '1c1683a35a0267c03729fa36b930c3dc803aff7a':
  Saver: PowerManager call to set low power mode.
 2014-09-14 20:09:39 +00:00
John Spurlock
8d4e6cb060 Saver: PowerManager call to set low power mode. 
- Add an explicit power manager call to set the low power mode state,
  instead of trying manage everything around a single setting.
- When low-power mode is triggered by falling below the configured
  threshold, it does not update the setting.
- The "is-enabled" api returns setting || below configured trigger.
- Move the snooze management into the new api call.
- Callers (sysui + settings) updated to use the api instead of the
  setting.
- Handles the case where the level does an unpowered leap out of the
  low battery level. (Possible if powered in-between while the device
  is off)

Bug:17460535
Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
 2014-09-14 14:07:23 -04:00
Marcin Kosiba
5e747beb43 am 6fc0dcd3: am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev 
* commit '6fc0dcd393eea224e770e8c1feab749dc56c1bfd':
  Don't use reflection when generating the onResourcesLoaded callback.
 2014-09-12 19:20:50 +00:00
Marcin Kosiba
0bdcb84b55 am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev 
* commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8':
  Don't use reflection when generating the onResourcesLoaded callback.
 2014-09-11 18:49:07 +00:00
Marcin Kosiba
a0a9466476 Merge "Don't use reflection when generating the onResourcesLoaded callback." into lmp-dev 2014-09-11 18:34:33 +00:00
Deepanshu Gupta
0eec0f7eb3 am 2af30be8: am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '2af30be8c9b4ad160fd954cb0b362a0288578a0e':
  LayoutLib: support font weights.
 2014-09-11 17:30:09 +00:00
Marcin Kosiba
0f3a5a6559 Don't use reflection when generating the onResourcesLoaded callback. 
BUG: 17466240
Change-Id: I74608f3d8b3617281639a9d387face97e15fb616
 2014-09-11 16:02:13 +01:00
Deepanshu Gupta
1cc6e8450b am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '92e039ee821aca56f80237c5f58a1f1756b0b3a7':
  LayoutLib: support font weights.
 2014-09-11 05:15:12 +00:00
Deepanshu Gupta
820ce63cea Merge "LayoutLib: support font weights." into lmp-dev 2014-09-11 04:54:26 +00:00
Deepanshu Gupta
145bc2d067 LayoutLib: support font weights. 
Also fixes a shader delegate method.

Change-Id: I86be80ab55d04760084d5bf39235f2ee4de7be23
 2014-09-10 17:01:16 -07:00
Dianne Hackborn
673d87e8c7 am 366ef556: am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '366ef5564592e4bc7937423c132d6d55d3bb298d':
  Fix build.
 2014-09-10 01:58:05 +00:00
Adam Lesinski
7035a91176 am f2d31392: am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev 
* commit 'f2d31392a49c4b2ff96c5861ea0393742c94733d':
  AAPT: Don't crash on illegal symbol name
 2014-09-10 01:09:46 +00:00
Dianne Hackborn
8611dde57b am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '803a6f399a2e0bfac8beb5d7ac2425dd3d9bdc46':
  Fix build.
 2014-09-10 01:04:22 +00:00
Adam Lesinski
017d1bdca7 am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev 
* commit '716c7279854318eeabad39b7bb187aa69ad41c97':
  AAPT: Don't crash on illegal symbol name
 2014-09-10 00:51:15 +00:00
Dianne Hackborn
d5adbec527 Merge "Fix build." into lmp-dev 2014-09-10 00:40:55 +00:00
Dianne Hackborn
f5cc3644f6 Fix build. 
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
 2014-09-09 17:38:34 -07:00
Adam Lesinski
e7ad74f070 Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev 2014-09-09 23:15:08 +00:00
Adam Lesinski
3fb8c9b50e AAPT: Don't crash on illegal symbol name 
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.

External bug: https://code.google.com/p/android/issues/detail?id=75876

Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
 2014-09-09 16:05:10 -07:00
Dan Albert
729b49e12f am f8631178: resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
* commit 'f8631178ea8d1dab768873b82d6ace96d01f23a7':
  Don't check for null references.
 2014-09-09 16:59:42 +00:00
Dan Albert
6800165351 resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df
 2014-09-09 09:51:01 -07:00
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references." 
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
 2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Dan Albert
181f731f9d am 167efbdf: Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit '167efbdfcf22143c7383091ba46d59bea9921e0d':
  Use char16_t for char things.
 2014-09-09 15:02:57 +00:00
Deepanshu Gupta
c4c0a76601 am 04c6a0c9: am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev 
* commit '04c6a0c95e0a1f491283034f3dbbf5c377066cb1':
  Build layoutlib create tests as part of sdk build.
 2014-09-09 05:29:26 +00:00
Baligh Uddin
ccf31a859a am 3f6f2fc0: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 
* commit '3f6f2fc062998115098b78a0f3c4bb71d0440f4c':
  Don't pollute the namespace for two uses.
 2014-09-09 05:29:22 +00:00
Dan Albert
bb4ed4947c Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-09 05:29:21 +00:00
Dan Albert
20ec4fa229 resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp 
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
 2014-09-08 22:25:54 -07:00
Deepanshu Gupta
3f82a64d44 am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev 
* commit '7e7fbbbac2d9b1bcda44cc4f9d81879772c354ed':
  Build layoutlib create tests as part of sdk build.
 2014-09-09 05:21:10 +00:00
Dan Albert
ddb605d4b2 am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." 
* commit 'de86cf1362ef0461b589fa85bdd5c58921010c6a':
  Don't pollute the namespace for two uses.
 2014-09-09 05:19:06 +00:00
Dan Albert
6c585756b4 am 2ffa4aab: Merge "Use char16_t for char things." 
* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
  Use char16_t for char things.
 2014-09-09 04:37:42 +00:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Dan Albert
de86cf1362 am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." 
* commit '5a6934c07946743e622df52ba1155d97129b37f0':
  Don't pollute the namespace for two uses.
 2014-09-09 04:23:57 +00:00
Dan Albert
1c6c7573e9 Don't pollute the namespace for two uses. 
Clang complains about ambiguity between std::hash and ::hash (locally
defined). There's no need to pull in the whole namespace for two uses of
std::map anyway.

Change-Id: Icbaa7ebbaad05999988784ad34662c721fb12b29
 2014-09-08 18:44:12 -07:00
Deepanshu Gupta
8f92d92a09 Build layoutlib create tests as part of sdk build. 
LayoutLib Create tests are now built whenever LayoutLib create is built.

Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
 2014-09-08 18:38:57 -07:00
Dan Albert
a8995adc2b Don't check for null references. 
The address of a reference will never be null in well formed C++ code.
The function returning the value being checked simply returns a
dereferenced pointer (which is just going to segfault if it is null!).

Change-Id: I3a4eb6adfc003c63ebf21b81d46088d52154d99d
 2014-09-08 18:34:29 -07:00
Dan Albert
f348c15ecf Use char16_t for char things. 
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
 2014-09-08 18:30:08 -07:00
Deepanshu Gupta
848e934122 am f12e394c: am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev 
* commit 'f12e394cd31b5caca3149e4c82e59c16ed1a4464':
  Update IntelliJ project file for IntelliJ 14
 2014-09-09 00:57:52 +00:00
Deepanshu Gupta
55d5449186 am abc64ebd: am ac00fca2: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev 
* commit 'abc64ebda4c9811bb165ccdeffc1a05ba02433a1':
  Add layoutlib tests to DIST_DIR
 2014-09-09 00:57:47 +00:00
Deepanshu Gupta
f37e218838 am 30800f5f: am 5728a78a: am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev 
* commit '30800f5f0391c45cc111b7874a12d865432537f3':
  Remove warning for null entries in resource array.
 2014-09-09 00:57:41 +00:00
Deepanshu Gupta
968051af09 am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev 
* commit '06e6b622b9f9c6501f4888704bb15154d7c0a703':
  Update IntelliJ project file for IntelliJ 14
 2014-09-09 00:47:41 +00:00
Deepanshu Gupta
6c39b72f57 am ac00fca2: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev 
* commit 'ac00fca287036b8496815c5da81222c5d34090f2':
  Add layoutlib tests to DIST_DIR
 2014-09-09 00:47:36 +00:00
Deepanshu Gupta
9668f59a0c am 5728a78a: am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev 
* commit '5728a78a4f618821bad926ffc340b0d2c3452e27':
  Remove warning for null entries in resource array.
 2014-09-09 00:47:31 +00:00
Deepanshu Gupta
8d29a06ad7 Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev 2014-09-09 00:31:03 +00:00
Deepanshu Gupta
93b828de58 Merge "Add layoutlib tests to DIST_DIR" into lmp-dev 2014-09-09 00:30:24 +00:00
Deepanshu Gupta
fa4e214814 Merge "Remove warning for null entries in resource array." into lmp-dev 2014-09-09 00:30:08 +00:00
Deepanshu Gupta
8c766fea93 Update IntelliJ project file for IntelliJ 14 
IntelliJ keeps reordering the options this way each time the project is
opened.

Change-Id: I0e19b5b0a858b3fa9a1134b883ed5180c4ef146e
 2014-09-08 14:49:49 -07:00
Winson Chung
2604908350 am df52495c: am 3004eee6: am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
* commit 'df52495ccc0b655031bb92b4961d7298076f2a72':
  Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
 2014-09-07 20:35:10 +00:00
Winson Chung
2e29a6dc03 am 3004eee6: am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
* commit '3004eee618c3fad547768210f9252bad5abb0f69':
  Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
 2014-09-07 20:25:59 +00:00
Winson Chung
2e7f3bdcc9 Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565) 
Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
 2014-09-07 20:08:40 +00:00