10379 Commits

Author SHA1 Message Date
Jeff Davidson
e6bc5adf2d am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev
* commit 'e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a':
  Enforce VPN control "permission" with an actual permission.
2014-11-17 22:58:05 +00:00
Jeff Davidson
e0cb56b02e Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 2014-11-17 21:02:10 +00:00
Geoff Mendal
6558805316 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 19:44:50 +00:00
Geoff Mendal
c81a3e16e7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 19:43:10 +00:00
Stuart Scott
343a88da1b am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev
* commit 'b19acb999353b8c1bce4f5acdc2ac9c29093bf99':
  Updating Subscription Info Icon
2014-11-17 19:21:12 +00:00
Stuart Scott
b19acb9993 Merge "Updating Subscription Info Icon" into lmp-mr1-dev 2014-11-17 19:16:51 +00:00
Stuart Scott
da5be611d8 Updating Subscription Info Icon
bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
2014-11-17 19:11:40 +00:00
Geoff Mendal
27b86af514 Import translations. DO NOT MERGE
Change-Id: Icdcfccda67a6a347e21ba85729eb6ecac01ec144
Auto-generated-cl: translation import
2014-11-17 10:50:04 -08:00
Geoff Mendal
adaa819bb7 Import translations. DO NOT MERGE
Change-Id: I31a7c6bc19264abd28b4c6d85e2fd94e6fd8f8ff
Auto-generated-cl: translation import
2014-11-17 10:41:15 -08:00
Jeff Sharkey
ecfd372ae4 am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev
* commit '9c76a7b3e85ce7056071ac8627c8d675cc5c1599':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
2014-11-17 17:32:31 +00:00
Jeff Sharkey
2cffc7dafd Warn user when build fingerprints differ.
We're now shipping devices with several partitions which may end up
mismatched, causing subtle runtime issues.  To help manufacturers and
users catch this case, show wanring when we detected mismatched
fingerprints.

Bug: 18357469
Change-Id: I897d7ee8cbf3b8042d3d7d282afab277d242ed3f
2014-11-14 14:28:06 -08:00
John Spurlock
8f84f62d1f am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev
* commit '8fe10b4b04447d997179604ead942fd4bbd5eef2':
  Volume: Move "Muted by" string from sysui to frameworks.
2014-11-14 21:44:52 +00:00
John Spurlock
96e7f0ed1a Volume: Move "Muted by" string from sysui to frameworks.
To enable sharing with Settings.

Bug: 17461563
Change-Id: Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5
2014-11-14 14:38:03 -05:00
Mark Renouf
7b6cadd404 am 437d02d3: am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
* commit '437d02d389711487a29662455b52a601053d9749':
  Sets windowOverscan for all Wear DeviceDefault themes.
2014-11-14 02:24:11 +00:00
Mark Renouf
437d02d389 am cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
* commit 'cd22c3d67c98a6ac98291c3337e6506546e771be':
  Sets windowOverscan for all Wear DeviceDefault themes.
2014-11-14 02:14:29 +00:00
Mark Renouf
de7187b956 Sets windowOverscan for all Wear DeviceDefault themes.
Without this flag, window insets will be consumed by the first View
which does not explicitly override onApplyWindowInsets. This is either
SwipeDismissLayout or the content view of the activity (if swipeDismiss
is not enabled).

BUG: 18376451
Change-Id: I5e590bad9810a9a232a6c318f715d587a3290f34
2014-11-13 19:12:55 -05:00
Alan Viverette
d200288a8b am 3fbb55c9: Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev
* commit '3fbb55c9061f6ea4b7bc63dfea1d86ba5bb308ad':
  Make indeterminate progress alpha consistent with determinate
2014-11-13 23:53:08 +00:00
Abhijith Shastry
530f25d629 am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
  new sms/mms carrier app API
2014-11-13 23:50:12 +00:00
Alan Viverette
3fbb55c906 Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev 2014-11-13 22:44:13 +00:00
Abhijith Shastry
fb8db1c84b Merge "new sms/mms carrier app API" into lmp-mr1-dev 2014-11-13 22:15:46 +00:00
Alan Viverette
95b3144782 Make indeterminate progress alpha consistent with determinate
Both should match the default disabledAlpha for controls.

BUG: 15900514
Change-Id: Ie7c801bc208a14f14926d38b462f49d1f91b28d0
2014-11-13 14:04:32 -08:00
Geoff Mendal
f26e4ce8b2 Import translations. DO NOT MERGE
Change-Id: I2b1c0b5c7530c8733d15551bb11211fa3e5585df
Auto-generated-cl: translation import
2014-11-12 21:07:02 -08:00
Cheuksan Wang
f9c50c45c6 new sms/mms carrier app API
BUG: 18005911

Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
2014-11-12 15:29:41 -08:00
Etan Cohen
c3dfc34012 am 00ead120: Fix VoLTE configuration on secondary TMO MCC/MNC.
* commit '00ead12087846eed465ffa5c9989878e7d2d0784':
  Fix VoLTE configuration on secondary TMO MCC/MNC.
2014-11-12 23:29:08 +00:00
Etan Cohen
00ead12087 Fix VoLTE configuration on secondary TMO MCC/MNC.
Added in ag/573693. But underlying mechanism changed in ag/573692 and
not adjusted.

Change-Id: I2e4784df38ba35aec477d657753974b7918b08b0
2014-11-12 23:23:08 +00:00
Alan Viverette
c164b97f46 am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
  Ensure time picker dialog fits on small screens
2014-11-12 17:35:58 +00:00
Alan Viverette
4fc2ea8402 Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 2014-11-12 17:32:31 +00:00
Alan Viverette
d9f3fdf45b Ensure time picker dialog fits on small screens
Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.

BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
2014-11-12 09:31:22 -08:00
Jeff Davidson
bc19c181c8 Enforce VPN control "permission" with an actual permission.
The current implementation uses a whitelist of package names. Use a
system|signature permission instead of rolling our own security and
add that permission to the existing set of whitelisted packages
(SystemUI and VpnDialogs).

In addition to being less of a security risk (using well-known methods
like Context.enforceCallingPermission rather than manually querying
PackageManager and checking UIDs for package names), this enables
other system-privileged apps to control VPN as needed per the below
bug.

Bug: 18327583
Change-Id: I38617965c40d62cf1ac28e3cb382c0877fb1275d
2014-11-12 08:56:20 -08:00
Jorim Jaggi
bd70ed1de2 am a816a075: Merge "Improve lockscreen launch animations" into lmp-mr1-dev
* commit 'a816a075066b7f90635d81918a7af9bc7a76e47f':
  Improve lockscreen launch animations
2014-11-12 15:51:56 +00:00
Jorim Jaggi
a816a07506 Merge "Improve lockscreen launch animations" into lmp-mr1-dev 2014-11-12 15:48:27 +00:00
Geoff Mendal
7c7bc451d0 Import translations. DO NOT MERGE
Change-Id: I3b1b01abb6e4575dd5e28217f3a5727c5a3a64fc
Auto-generated-cl: translation import
2014-11-12 06:52:59 -08:00
Geoff Mendal
6b6c626440 Import translations. DO NOT MERGE
Change-Id: I1d3ed380c4223bdb6bc2b3d4def0f270a8035b80
Auto-generated-cl: translation import
2014-11-12 06:44:26 -08:00
Jorim Jaggi
f8d77da969 Improve lockscreen launch animations
- Add a timeout so if WindowManager "forgets" to tell that the
activity has drawn, we still unlock after 3 seconds, so the user
is not completely stuck.

- Use the screen height instead of the window height for the
translation animation.

- Don't run the animation if the attached window is not null. The
animation from the attached window will influence the transformation
as well, so there is no need to run an additional animation in this
case (apps with SurfaceView's had broken unlock transitions because
of this).

- If the starting window needs to go away while the unlock transition
is running, modify the existing animation such that it fades out in
the same transition.

Bug: 15991916
Change-Id: Ia5dfa31e1bc0d5745fe228e1daf08e268733b6f1
2014-11-12 15:02:33 +01:00
Bryce Lee
70532bf464 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773
automerge: 5c14bc2

* commit '5c14bc213be3e311c150b7cb86dc880937b3b7b7':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
2014-11-12 01:21:13 +00:00
Winson Chung
6a601c9ee8 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
automerge: 147de3a

* commit '147de3a9766e205af068d1462beaea7a4a9fb9bc':
  Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
2014-11-12 01:16:47 +00:00
Bryce Lee
5c14bc213b Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev
automerge: 68f9773

* commit '68f97736e65f1be4664fd3c3765fc621f3b76c3a':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
2014-11-12 01:02:49 +00:00
Winson Chung
147de3a976 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-11-12 00:10:55 +00:00
Winson Chung
a91c293be2 Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
This change ensures that only the number of visible thumbnails and task icons are
loaded to minimize the delay required when initializing the stack without the 
cache.  In addition, this change reduces the number of times that the task stack
is recomposed when launching recents (in addition to the number of calls to 
getRecentTasks()).

There is also a fix to a regression where the exit trigger is not run when the
task stack view is empty.

Change-Id: I75834ff3c57c0e5dad6252b982f71c6e740071f2
2014-11-11 16:10:05 -08:00
Bryce Lee
68f97736e6 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev 2014-11-11 23:59:34 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Tim Kilbourn
215779b226 am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev
* commit '54a5ca1aad1bdbb154ca731ab9a6c026d58a42d6':
  Add tv product variants to strings.
2014-11-11 06:37:52 +00:00
Tim Kilbourn
54a5ca1aad Merge "Add tv product variants to strings." into lmp-mr1-dev 2014-11-11 06:32:33 +00:00
Alan Viverette
f89b58ca83 Fix Material styling in remaining dialogs and layouts
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.

BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
2014-11-10 16:14:27 -08:00
Bryce Lee
812d7025d2 Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
Bug: 18297399
Change-Id: I5a520e8bf861e46d61e54d7d0849e55b2e5d9239
2014-11-10 13:33:28 -08:00
Evan Charlton
3caf6fc7df Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev
automerge: e2e649f

* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
  Apply @hide / @SystemApi to android.telecom.*
2014-11-10 20:29:27 +00:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.*
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.

Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
2014-11-10 11:52:31 -08:00
Tim Kilbourn
8299d02927 Add tv product variants to strings.
Bug: 18053999
Change-Id: I7d1a21600d7b0e4dea16b8cf7a2fc1ba552de930
2014-11-10 10:45:13 -08:00
Geoff Mendal
547b9ba1ec Import translations. DO NOT MERGE
Change-Id: I5f5fab81cb5dc43388dba446d704c6f50e0415d9
Auto-generated-cl: translation import
2014-11-10 07:03:14 -08:00