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

11646 Commits

Author SHA1 Message Date
Alan Viverette
3224f3530c Merge "Clean up ViewStub inflation to ensure it has resources" 2014-12-15 23:18:14 +00:00
Alan Viverette
39a72dd207 Clean up ViewStub inflation to ensure it has resources 
BUG: 18642716
Change-Id: I52be9d379672ef143cd385c78a8e0744225de4ae
 2014-12-15 11:23:57 -08:00
Geoff Mendal
ea34eb0f89 Import translations. DO NOT MERGE 
Change-Id: I82675c345db8ce5b5c4d6ac94e2af91ae9dcfca1
Auto-generated-cl: translation import
 2014-12-15 10:09:53 -08:00
Prem Kumar
c270a1c878 am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
automerge: 3be9a9c

* commit '3be9a9cefb5f5c25c3b6ed85f41da8c5aa7b1e6b':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 20:08:52 +00:00
Prem Kumar
3be9a9cefb am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
* commit 'cb9379ca774a503a9d33f3c0e8c5010495d2af58':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 20:06:22 +00:00
Prem Kumar
6c2fa049aa Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 2014-12-14 19:52:40 +00:00
Amit Mahajan
368cf66e20 am dee84a87: am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev automerge: cac8662 
* commit 'dee84a8796ed60a4a87d95238e160394fb166a95':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-12 04:12:16 +00:00
Amit Mahajan
dee84a8796 am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 
automerge: cac8662

* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-12 04:05:59 +00:00
Amit Mahajan
c5da1d3ddf Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 2014-12-11 18:39:23 +00:00
vandwalle
b713a7686e handle beacons reported with wrong RSSI value of 0 - Bug:18654243 
Change-Id: I7a387c930e70a7f99239389e6fd9d2b957cf3b00
 2014-12-11 02:58:44 -08:00
vandwalle
a353a3b48a am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev automerge: 76dc7a1 
automerge: dca701a

* commit 'dca701a8fac49f2cd440dd95aae510aef412fdf4':
  adjust network switching thresholds Bug:18589301
 2014-12-11 10:23:14 +00:00
vandwalle
dca701a8fa am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 
automerge: 76dc7a1

* commit '76dc7a1abe2d69013dbc8238292d239ac1287e2c':
  adjust network switching thresholds Bug:18589301
 2014-12-11 03:41:48 +00:00
vandwalle
b897f013b5 Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 2014-12-11 03:18:42 +00:00
Alan Viverette
d8d9cbe3ff am 1259ab3a: am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '1259ab3a881adb008b74e5ad81c84e088f674cf6':
  Avoid creating futures for drawables with no constant state
 2014-12-11 01:38:38 +00:00
Alan Viverette
1259ab3a88 am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '3d517a701cb583f59ed8deefd21ab854c3890065':
  Avoid creating futures for drawables with no constant state
 2014-12-11 00:07:20 +00:00
Alan Viverette
62b780e85f Avoid creating futures for drawables with no constant state 
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.

Rider: Also fixes elevations again.

BUG: 18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
 2014-12-10 13:52:28 -08:00
Geoff Mendal
1372d45f62 Import translations. DO NOT MERGE 
Change-Id: I76f2d3cafc025d0c1c34e0b3fbfc30c73ac3adba
Auto-generated-cl: translation import
 2014-12-10 11:35:51 -08:00
Geoff Mendal
7e7646487e Import translations. DO NOT MERGE 
Change-Id: I101fba3b08265cb881495252573df6088a439955
Auto-generated-cl: translation import
 2014-12-10 08:40:30 -08:00
vandwalle
08fe024a47 adjust network switching thresholds 
Bug:18589301

Change-Id: I6f08e4b6cbc642a2de4800dc45b68dafae9c2b61
 2014-12-09 16:20:11 -08:00
Pavel Zhamaitsiak
fd3090aefb am 8bd0b516: am bf7b4d94: am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit '8bd0b516751df764b9c47fa64e31d7125e0942f0':
  Added configuration to determine whether VoLTE requires provisioning.
 2014-12-09 23:49:05 +00:00
Alan Viverette
1a27a0db7c am 08431d05: am c3e16fe3: am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev 
* commit '08431d056990f2dd3bd0d3a0ac8ea9006b423315':
  Add focused & disabled states for spinner assets
 2014-12-09 23:20:21 +00:00
Alan Viverette
bf4cc5783b am 87dd3428: am 3891784f: am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 
* commit '87dd3428f04031f3b13dba5a4c202ab4ab6932fc':
  Adjust edit text layout, ripple alphas to be closer to Material spec
 2014-12-09 22:23:14 +00:00
John Spurlock
089c6d79e3 am ef10307e: am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit 'ef10307e4a4942c5867ba696e12e13556ac7a716':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-09 22:23:04 +00:00
Pavel Zhamaitsiak
8bd0b51675 am bf7b4d94: am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit 'bf7b4d9489a10dd1ed39175c55abafc3bef9c2a9':
  Added configuration to determine whether VoLTE requires provisioning.
 2014-12-09 20:34:55 +00:00
Etan Cohen
b332eda5eb Added configuration to determine whether VoLTE requires provisioning. 
Bug: 18576107
Change-Id: I7e2e7f6549e3e1b94ad7aa4126b26fcb5dcd807b
 2014-12-09 10:03:21 -08:00
ztenghui
3de2fd483c am 4cb33e76: am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 
* commit '4cb33e7657f9adae41fda5fd95c23060f515a238':
  Fine tune the light radius from 800dp to 600dp
 2014-12-09 00:19:43 +00:00
Sanket Padawe
13ead56beb am 17c2719d: am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '17c2719d037bee0823dd90c363cee4716ed43d5b':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-09 00:19:38 +00:00
Jing Zhao
a0973778ca am 8d50d0fb: am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
* commit '8d50d0fb27c1958dbd047bb8a46d7183d873f131':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
 2014-12-09 00:19:03 +00:00
Cheuksan Wang
8b3f47b35a am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 
* commit '673f443f7e92956399c322b31a14178436fa723b':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
 2014-12-09 00:18:12 +00:00
Alan Viverette
08431d0569 am c3e16fe3: am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev 
* commit 'c3e16fe33dacd6e676c31332d0bd97de8a2d6a45':
  Add focused & disabled states for spinner assets
 2014-12-09 00:17:56 +00:00
Alan Viverette
d505fb7917 am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '5f5e13d07fcf7531c0bb61f147732a430ad5aeda':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-09 00:16:54 +00:00
Alan Viverette
3ba8328825 Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev 2014-12-08 22:08:07 +00:00
Alan Viverette
07ac7fbcab Add focused & disabled states for spinner assets 
Regression from KK. Bad copy/paste from another asset. Checked should
have been changed to focused.

BUG: 18669124
Change-Id: I0b86c0437cbe14b46b6a0b7047656ec15bf2d758
 2014-12-08 13:47:21 -08:00
Jason Monk
8f51036c45 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-12-08 20:29:25 +00:00
Jason Monk
1bcdba7b1a am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '0538e675db393777ca1090725b71d54d78fce007':
  Make CarrierText handle multi-sim
 2014-12-08 20:29:16 +00:00
Geoff Mendal
d408f3b9b4 Import translations. DO NOT MERGE 
Change-Id: I53629d1cb87f02a6602c5b311fa7cea218745da2
Auto-generated-cl: translation import
 2014-12-08 12:14:50 -08:00
Alan Viverette
87dd3428f0 am 3891784f: am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 
* commit '3891784f305edabe20f518bc43b3114e2bf38122':
  Adjust edit text layout, ripple alphas to be closer to Material spec
 2014-12-08 19:44:21 +00:00
John Spurlock
ef10307e4a am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 19:43:38 +00:00
ztenghui
4cb33e7657 am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 
* commit '550348220e959ff3c98b88c191a849ea2ee6062a':
  Fine tune the light radius from 800dp to 600dp
 2014-12-08 19:18:13 +00:00
Sanket Padawe
17c2719d03 am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-08 19:17:45 +00:00
Jing Zhao
8d50d0fb27 am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
* commit '23ad6efbf81f1ea4f1e7b24ee0ca623045063b2f':
  Add checking to find AppDirectedSmsProxy for App Directed SMS feature
 2014-12-08 19:17:16 +00:00
Cheuksan Wang
673f443f7e am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 
* commit '695b5d25879e894d381e95017b9ce5166adbb09f':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
 2014-12-08 19:15:57 +00:00
Alan Viverette
5f5e13d07f am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '108e539495edb2bfc0d1a3a2cb0879583561bed6':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-08 19:12:32 +00:00
Jason Monk
0538e675db am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
  Make CarrierText handle multi-sim
 2014-12-08 19:09:10 +00:00
Alan Viverette
3ad4153710 Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 2014-12-08 17:57:16 +00:00
John Spurlock
20a46fb14f am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '2ea3650d18ab0ce4dba2cee101d639400b411452':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 16:52:49 +00:00
John Spurlock
2ea3650d18 Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 2014-12-08 16:47:28 +00:00
Geoff Mendal
2119b65f83 Import translations. DO NOT MERGE 
Change-Id: Iafa118acf3037310f0b60425500b21a714103406
Auto-generated-cl: translation import
 2014-12-08 08:07:06 -08:00
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions. 
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
 2014-12-08 11:00:57 -05:00
Alan Viverette
d52381883d Adjust edit text layout, ripple alphas to be closer to Material spec 
Removes all ldpi Material assets since we never actually made real ldpi
assets. Most of the ones we had here were out of date.

BUG: 18643923
BUG: 18390994
Change-Id: Id66087fb23a88407a48805d6f7a26d79a0a399a0
 2014-12-05 15:09:27 -08:00