Commit Graph

25490 Commits

Author SHA1 Message Date
Clara Bayarri
56462d668a Make Work profile lock unification a toggle
The setting to unify work and personal locks is now a toggle,
and therefore always available.

When unifying, if the work lock is sufficient as a device lock
we confirm both locks and set the work lock as the device lock.
If the work lock is not sufficient for the device, the user is
informed and taken to the lock setup flow to set a new unified
lock for both.

Also fix related Strings given UX feedback.

Bug: 26816580
Change-Id: Id019234b0a5ff4462c5f9ba86e53e30981a03e0d
2016-02-23 11:48:56 -08:00
Noah Wang
14f102915a Read out confirmation message upon selecting options on LabeledSeekBar.
bug: 26965949
Change-Id: I2693ac6849f5c72b2bbd4f775911ea18398746f6
2016-02-23 11:27:50 -08:00
Alan Viverette
208b0e8133 Merge "Change Display size option "normal" to "default"" into nyc-dev
am: 7f9c2849f7

* commit '7f9c2849f7bceb22e7cfc4670f40c5c7c7bcc8b2':
  Change Display size option "normal" to "default"
2016-02-23 18:46:48 +00:00
Alan Viverette
7f9c2849f7 Merge "Change Display size option "normal" to "default"" into nyc-dev 2016-02-23 18:42:24 +00:00
Alan Viverette
94ecc81376 Change Display size option "normal" to "default"
Bug: 27274227
Change-Id: I83b949cabaf333aa45cfef1beaa986d66067fa53
2016-02-23 13:17:16 -05:00
Felipe Leme
4b3fe9f40a Merge "Logs bugreport type metrics." into nyc-dev
am: 372163f943

* commit '372163f94390902ac569210cd3e36c3b9550a29d':
  Logs bugreport type metrics.
2016-02-23 18:14:23 +00:00
Felipe Leme
372163f943 Merge "Logs bugreport type metrics." into nyc-dev 2016-02-23 18:11:45 +00:00
Baligh Uddin
f20e68c94c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I52d0f7327dfa403c0f1f5a886b48036efb9c8b6a
2016-02-23 09:50:35 -08:00
Jason Monk
d1ea8a05b0 Fix and update battery detail page
Bug: 27205329
Change-Id: Ie984348d59c1b15bec7283a94a94489f78cacb79
2016-02-23 12:45:20 -05:00
Clara Bayarri
2ce79425b8 Merge "Move Profile Security Settings into Security Settings" into nyc-dev
am: 9c299734bb

* commit '9c299734bbe0b1b4772f5967068079d255dc35d5':
  Move Profile Security Settings into Security Settings
2016-02-23 17:28:12 +00:00
Clara Bayarri
9c299734bb Merge "Move Profile Security Settings into Security Settings" into nyc-dev 2016-02-23 17:25:08 +00:00
Felipe Leme
7b11c500f6 Logs bugreport type metrics.
BUG: 26759986
Change-Id: Ie4045301fadfb608aa694bc9a9756a703dd194ed
2016-02-23 09:09:13 -08:00
Daniel Sandler
54a644df34 Merge "Enhanced notification details." into nyc-dev
am: 712568cd15

* commit '712568cd151158a989e5c75b13ac11d1e53901dc':
  Enhanced notification details.
2016-02-23 15:48:53 +00:00
Daniel Sandler
712568cd15 Merge "Enhanced notification details." into nyc-dev 2016-02-23 15:44:41 +00:00
Gustav Sennton
a4e32a24c4 Block the user from enabling or disabling webview fallback packages.
Now that we support webview fallback packages - packages that should be
enabled if and only if no other webview packages are available - we need
to ensure that the Settings UI consistently shows that these packages
cannot be enabled or disabled (e.g. the 'Enable' and 'Disable' buttons
for enabling/disabling them are greyed out).

Also, remove the Dialog that lets a user enable a disabled webview
package from the webview implementation Dev Setting. Instead show a
Toast if the user has chosen an invalid package.

Bug: 26375524, 26375860

Change-Id: I949083d3f7c83cd2e049dd2c5c15ec5ab880fe07
2016-02-23 14:09:13 +00:00
Wale Ogunwale
b075a4b699 Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev
am: 0b485bb523

* commit '0b485bb5233057507d01e4baa02f6ede72ed3306':
  Revert "Add developer option for freeform window support (2/2)"
2016-02-23 02:38:56 +00:00
Wale Ogunwale
0b485bb523 Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev 2016-02-23 02:27:14 +00:00
Clara Bayarri
52681ece04 Move Profile Security Settings into Security Settings
UX requested that we have the settings directly in Security instead
of having a separate screen as implemented previously.

Bug: 26806582
Change-Id: I55c44848621498afe63d3207a52c974c58f9eb78
2016-02-22 16:56:50 -08:00
Udam Saini
596c6db38a Merge "Hides retry button in setup wizard during confirm stage." into nyc-dev
am: 991fa2643e

* commit '991fa2643e8fad3d0d848f88ebeeab704e486944':
  Hides retry button in setup wizard during confirm stage.
2016-02-23 00:26:48 +00:00
Udam Saini
37af49083b Merge "Fixes talkback accessibility on learn more link." into nyc-dev
am: 1004769135

* commit '1004769135507b26c6a626af1ca1da9cfc1e811d':
  Fixes talkback accessibility on learn more link.
2016-02-23 00:20:16 +00:00
Udam Saini
991fa2643e Merge "Hides retry button in setup wizard during confirm stage." into nyc-dev 2016-02-23 00:19:25 +00:00
Udam Saini
1004769135 Merge "Fixes talkback accessibility on learn more link." into nyc-dev 2016-02-23 00:10:40 +00:00
Wale Ogunwale
a48c78ccfc Revert "Add developer option for freeform window support (2/2)"
This reverts commit 292b9fd2da.

Will add back later and limit to non-user builds.

Bug: 27295415
Bug: 25276672
Bug: 24815256
Change-Id: Ide230449615318a0d3f4bc607724e7eaaf1d43c4
2016-02-22 15:41:43 -08:00
Udam Saini
e117fd0b9a Hides retry button in setup wizard during confirm stage.
bug:24803305
Change-Id: Ib5f47bbd266f50e74515594cc90f73953f8ec8ce
2016-02-22 23:30:19 +00:00
Sudheer Shanka
e3dbfb1a6b Update the admin app icon in the support dialog.
Change-Id: Ia1212b682e9168340b8df678a5880f50ee579485
2016-02-22 22:39:26 +00:00
Udam Saini
9b58982210 Merge "Moves the encryption interstitial to use the list layout" into nyc-dev
am: 511107c09b

* commit '511107c09ba5daf5e674e278ea0d143360b5e449':
  Moves the encryption interstitial to use the list layout
2016-02-22 21:37:59 +00:00
Udam Saini
511107c09b Merge "Moves the encryption interstitial to use the list layout" into nyc-dev 2016-02-22 21:29:30 +00:00
Alan Viverette
4a24fb99e9 Merge "Remove night mode from developer settings" into nyc-dev
am: f4ace6fe91

* commit 'f4ace6fe91726665715312b0b0ec22a4ba360b61':
  Remove night mode from developer settings
2016-02-22 20:47:33 +00:00
Chris Tate
9854ee56e7 Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev
am: 7893931a50

* commit '7893931a505921f700a85bd2668f041d7d86bf1a':
  Text: "...and other URLs" rather than "...and related URLs"
2016-02-22 20:47:15 +00:00
Jason Monk
f1e00c8df9 Merge "Fix data usage multi-sim stuff" into nyc-dev
am: 2dd744f824

* commit '2dd744f824cfb07298ef7bba84cfd4ede84b8316':
  Fix data usage multi-sim stuff
2016-02-22 20:46:59 +00:00
Alan Viverette
f4ace6fe91 Merge "Remove night mode from developer settings" into nyc-dev 2016-02-22 20:44:00 +00:00
Chris Tate
7893931a50 Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev 2016-02-22 20:43:38 +00:00
Jason Monk
2dd744f824 Merge "Fix data usage multi-sim stuff" into nyc-dev 2016-02-22 20:38:57 +00:00
Christopher Tate
0119225372 Text: "...and other URLs" rather than "...and related URLs"
Bug 26692609

Change-Id: Ibb4f44950f03d66df161aee2e0661b9db57b031f
2016-02-22 12:30:33 -08:00
Jason Monk
02736d1bf2 Merge "Fix wallpaper prefs being too tall" into nyc-dev
am: 3795d708ce

* commit '3795d708ce8a6898ef75f5e601f39b34840d80e8':
  Fix wallpaper prefs being too tall
2016-02-22 20:29:16 +00:00
Andres Morales
8b85fbfe51 fix issue when cancelling OEM unlocking change
Bug: 26928752
Change-Id: Ibafe9df564f1035cbd6782d8982bc3b424ee3cb4
2016-02-22 12:26:45 -08:00
Jason Monk
3795d708ce Merge "Fix wallpaper prefs being too tall" into nyc-dev 2016-02-22 20:22:37 +00:00
Jason Monk
8d6350385d Fix wallpaper prefs being too tall
Change-Id: Iddb45c77eb5014a596e9f94e3a2a9065165b2711
2016-02-22 15:21:45 -05:00
Jason Monk
ac933ab5d7 Fix data usage multi-sim stuff
Bug: 26866568
Change-Id: I5d1a6547124c1744af7e30c5a02b46ca07cc81e8
2016-02-22 15:13:05 -05:00
Alan Viverette
686f984384 Remove night mode from developer settings
It's in SysUI Tuner now.

Change-Id: If1c248bfaa964b4f37155619a4c54f836d33e468
2016-02-22 13:47:50 -05:00
Dan Sandler
7a038ebb1c Enhanced notification details.
Bug: 26919636
Change-Id: I378dc088a6b51e3b33607937c3a12e8d51a97e5e
2016-02-22 12:52:38 -05:00
Geoff Mendal
cf1a4b118c Import translations. DO NOT MERGE
am: 0cb45a495e  -s ours

* commit '0cb45a495e0ea24bd03a4f95f076c130ce46c4f1':
  Import translations. DO NOT MERGE
2016-02-22 16:26:40 +00:00
Julia Reynolds
5c34618128 Merge "Delete topics." into nyc-dev
am: 778957cfac

* commit '778957cfaca203fffa7e7eb7f891b9661d50d216':
  Delete topics.
2016-02-22 15:37:24 +00:00
Geoff Mendal
0cb45a495e Import translations. DO NOT MERGE
Change-Id: I91a9aabb3a7378e68234fa42fb5ffdb999c8235e
Auto-generated-cl: translation import
2016-02-22 07:32:39 -08:00
Julia Reynolds
778957cfac Merge "Delete topics." into nyc-dev 2016-02-22 15:23:45 +00:00
Julia Reynolds
fefcdbed42 Delete topics.
Bug: 23220370
Change-Id: Ib1bc26183f00685b6547d5ffe37ce149c31fe153
2016-02-22 10:20:01 -05:00
Jason Monk
ea174fd1c7 Merge "Fix background data setting being backwords" into nyc-dev
am: 60df76b169

* commit '60df76b169c7d341130265a99a23bbfa63934f9c':
  Fix background data setting being backwords
2016-02-22 15:11:52 +00:00
Jason Monk
60df76b169 Merge "Fix background data setting being backwords" into nyc-dev 2016-02-22 15:04:46 +00:00
Jason Monk
25f0ca889d Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev
am: 4062c3932e

* commit '4062c3932e356ebd01ed64ecc1dc6d723f32857f':
  Convert data usage warning/limit to a edit text + dropdown
2016-02-22 14:59:47 +00:00
Jason Monk
4062c3932e Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev 2016-02-22 14:57:51 +00:00