Commit Graph

25531 Commits

Author SHA1 Message Date
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
Gustav Sennton
5aa4d7b67e Merge "Don\'t show disabled packages in the WebView implementation Dev setting." into nyc-dev
am: b2e8d34359

* commit 'b2e8d34359f8272f8214d16b09288505e2570d10':
  Don't show disabled packages in the WebView implementation Dev setting.
2016-02-22 10:12:35 +00:00
Gustav Sennton
b2e8d34359 Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev 2016-02-22 10:10:13 +00:00
Jason Monk
bd5eabe12e Fix background data setting being backwords
Bug: 27250166
Change-Id: Ia8ef4b0ab860e6c15d972a32c7918b2d54f7743b
2016-02-21 11:53:36 -05:00
Jason Monk
e4897d939b Convert data usage warning/limit to a edit text + dropdown
Now choose between MB and GB, then type in the number for the limit.

Bug: 27238018
Change-Id: I049be2be3ded52a9ed87e57348ed87b82dbb819c
2016-02-21 11:39:42 -05:00
Jason Monk
f6d69edaf5 Add generic logging to Settings switch bar
am: e4ebcd12be

* commit 'e4ebcd12be7baae58a1fabcda6c7544c911c95eb':
  Add generic logging to Settings switch bar
2016-02-21 14:41:36 +00:00
Jason Monk
e4ebcd12be Add generic logging to Settings switch bar
Same usage/format as the shared preference logging.

Bug: 27043208
Change-Id: I7a7a5c0a9c92ec6cef50df58313016218cf2f2f7
2016-02-21 09:37:41 -05:00
Udam Saini
d553abcb4c Moves the encryption interstitial to use the list layout
bug:27206957
Change-Id: Ib577440a2696539f44021bb4ba0100e9f1699c6c
2016-02-19 16:28:34 -08:00
Samuel Tan
688a34defe WifiConfigController: set ca_path and ca_cert to null if unused am: d147f0090c
am: 18d9865388

* commit '18d98653883d4d28f8700588c3f4aad91f47411e':
  WifiConfigController: set ca_path and ca_cert to null if unused
2016-02-20 00:23:46 +00:00
Samuel Tan
18d9865388 WifiConfigController: set ca_path and ca_cert to null if unused
am: d147f0090c

* commit 'd147f0090ce28e1ad70f7a9b582dec91161139e8':
  WifiConfigController: set ca_path and ca_cert to null if unused
2016-02-20 00:12:03 +00:00