Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

11627 Commits

Author SHA1 Message Date
Geoff Mendal
1372d45f62 Import translations. DO NOT MERGE 
Change-Id: I76f2d3cafc025d0c1c34e0b3fbfc30c73ac3adba
Auto-generated-cl: translation import
 2014-12-10 11:35:51 -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
ztenghui
62517a6e9c Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 2014-12-05 21:56:02 +00:00
Alan Viverette
b2accbb6d2 am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit '23d86231e9af2f4ba43cbc8a8cbbfc9757a98ddc':
  Update locally cached drawables when constant state changes
 2014-12-05 21:49:36 +00:00
Alan Viverette
23d86231e9 am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit 'ae656af727966df132d5ec7a462bc8bd98e41b71':
  Update locally cached drawables when constant state changes
 2014-12-05 21:41:10 +00:00
Sanket Padawe
0c1a5bea2e Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 2014-12-05 20:55:52 +00:00
Jing Zhao
df1d07b4c7 Add checking to find AppDirectedSmsProxy for App Directed SMS feature 
Adding new system permission android.permission.CARRIER_FILTER_SMS

Bug: 18609762
Change-Id: I80a133653101cd4ec1793e726faf3601e2970224
 2014-12-05 20:42:33 +00:00
Cheuksan Wang
0752da22c7 Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 2014-12-05 19:07:10 +00:00
Cheuksan Wang
981344861c add system|signature protection to 
android.permission.BIND_CARRIER_MESSAGING_SERVICE

Bug: 18005911
Change-Id: Iacb16a20c5cef4a55be0187af0a47e0cb82b409b
 2014-12-05 19:04:55 +00:00
ztenghui
e6672cfe6e Fine tune the light radius from 800dp to 600dp 
The spot shadow will change very slightly, as smaller and darker,
which is what UX team want.

b/18631715

Change-Id: I9ce098cf54c5875fa7bd3c20095b526ea2e661e6
 2014-12-05 11:04:22 -08:00
Alan Viverette
6dfa60f33c Avoid extra saveLayer calls in RippleDrawable, fix docs 
Also fixes opacity returned from InsetDrawable to accurately reflect
the transparent inset area and updates button to correctly use tint.

BUG: 18226391
Change-Id: Ia9a88d9d663990a6829d2f251c7f59ea2a79d816
 2014-12-04 16:52:16 -08:00
Jason Monk
d601c6c5c3 Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 2014-12-04 22:31:58 +00:00
Jason Monk
9ff69bd8f1 Make CarrierText handle multi-sim 
To do this need to handle the subscription id that comes with all
spn broadcasts and concatenate properly as needed.

Bug: 18223317
Change-Id: I2a1cde0a4bf2f50082288cc5cdeb968fa9aa7dd0
 2014-12-04 17:29:12 -05:00
duho.ro
2aa105d81e am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '7c6144730b347fa93ce124cbf5244f5eaa2ca255':
  UICC : discard language setting of SIM
 2014-12-04 21:55:24 +00:00
Cheuksan Wang
412766a7d6 am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
  new SMS/MMS carrier app API
 2014-12-04 21:55:19 +00:00
duho.ro
7c6144730b am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '36ccf75bb26604786f1d99ab1703ba01f8c3290c':
  UICC : discard language setting of SIM
 2014-12-04 21:45:14 +00:00
Cheuksan Wang
29ac679f9f am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
  new SMS/MMS carrier app API
 2014-12-04 21:45:08 +00:00
Sanket Padawe
a2bf987b74 Doing provisioning check for wifi tethering from SystemUI 
+ Calling activity which calls provisioning app only if provisioning
is needed.
+ Hiding Hotspot tile from quick settings when screen is locked.

Bug: 18368949
Change-Id: I5b92a7f2d46c8b5d9b323d6a5d49315694c599f7
 2014-12-04 13:41:17 -08:00
Alan Viverette
ebc9f2e773 Update locally cached drawables when constant state changes 
Previously we were failing to update references to drawables that had
been pulled from constant state, so we were drawing the wrong ones.

Also fixes button Z translation on press, which was WAY too high.

BUG: 18542282
Change-Id: Ifde7d64e31d31737854cfcbe75777e5b07a06e3a
 2014-12-04 12:54:46 -08:00
Robert Greenwalt
48af2cf8cd am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
  Separate voice/data roaming state and type
 2014-12-04 20:45:03 +00:00