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
Alan Viverette
f4ace6fe91
Merge "Remove night mode from developer settings" into nyc-dev
2016-02-22 20:44:00 +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
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
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
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
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
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
Maurice Lam
059c0f6e84
Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev
...
am: 9a6aaebc74
* commit '9a6aaebc74f6e88eec2a220f01331d9e32ba9448':
Revert "Revert "Use SetupWizardPreferenceLayout""
2016-02-19 22:13:34 +00:00
Maurice Lam
9a6aaebc74
Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev
2016-02-19 22:03:41 +00:00
Jason Monk
087624719b
Merge "Rename storage and usb to just storage" into nyc-dev
...
am: 6348dac543
* commit '6348dac5436f7d9aa2f54af7a2c077004870bee1':
Rename storage and usb to just storage
2016-02-19 21:33:51 +00:00
Jason Monk
6348dac543
Merge "Rename storage and usb to just storage" into nyc-dev
2016-02-19 21:26:00 +00:00
Jason Monk
b918d97d5d
Rename storage and usb to just storage
...
Bug: 23840185
Change-Id: If0ea6be5a43b8aea1b49c46f3f95a92bef05aaf7
2016-02-19 15:32:33 -05:00
Sudheer Shanka
dd2210f01c
Add disabled by policy empty views to more screens.
...
am: 7dbbe13168
* commit '7dbbe131683c231f6820bca4d67853649a4836f8':
Add disabled by policy empty views to more screens.
2016-02-19 20:30:02 +00:00
Sudheer Shanka
7dbbe13168
Add disabled by policy empty views to more screens.
...
Bug: 27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32
2016-02-19 20:18:43 +00:00
Sudheer Shanka
2c72056df2
Merge "Part3 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev
...
am: 5d8e963c83
* commit '5d8e963c83fd9198cb66e7fc745f9ff2a1919c44':
Part3 - Don't add padlock if the restriction is not set by admin.
2016-02-19 19:39:21 +00:00
Sudheer Shanka
5d8e963c83
Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev
2016-02-19 19:31:45 +00:00
Julia Reynolds
7c9b814d4a
Merge "Delete Notification Topics." into nyc-dev
...
am: 929c97e6ac
* commit '929c97e6acf725df87456ad053ee47df47c921aa':
Delete Notification Topics.
2016-02-19 19:26:59 +00:00
Julia Reynolds
929c97e6ac
Merge "Delete Notification Topics." into nyc-dev
2016-02-19 19:17:24 +00:00
Sudheer Shanka
77759c2310
Merge "Update strings related to policy transparency." into nyc-dev
...
am: 4e02a515d1
* commit '4e02a515d1c75b75a4fa2d515174d9b50a7e64c8':
Update strings related to policy transparency.
2016-02-19 16:36:53 +00:00
Sudheer Shanka
4e02a515d1
Merge "Update strings related to policy transparency." into nyc-dev
2016-02-19 16:33:30 +00:00
Toby Sargeant
02db2ff667
Merge "add developer setting for multiprocess webview" into nyc-dev
...
am: ab1a97c307
* commit 'ab1a97c30766b15a541a9bee35f853ffd8fefcca':
add developer setting for multiprocess webview
2016-02-19 09:18:27 +00:00
Toby Sargeant
ab1a97c307
Merge "add developer setting for multiprocess webview" into nyc-dev
2016-02-19 09:14:56 +00:00
Maria Garcia Puyol
c4b1a74806
Merge "Show emergency info preference for all users" into nyc-dev
...
am: adcec744b2
* commit 'adcec744b2699a54db5606e9a50a08c6fb243a0e':
Show emergency info preference for all users
2016-02-18 21:04:38 +00:00
Jason Monk
f40b07becc
Merge "Make battery settings use new battery graph." into nyc-dev
...
am: fd267eb2ed
* commit 'fd267eb2ed842c29225a9ef0d7fcf45733263a99':
Make battery settings use new battery graph.
2016-02-18 21:04:28 +00:00
Jason Monk
41f69453a5
Merge "Fix date and time and apn editing" into nyc-dev
...
am: 91c2c96978
* commit '91c2c96978fe9b5554a1ad16e26765e14cffca12':
Fix date and time and apn editing
2016-02-18 21:04:17 +00:00
Maria Garcia Puyol
adcec744b2
Merge "Show emergency info preference for all users" into nyc-dev
2016-02-18 19:19:04 +00:00
Jason Monk
fd267eb2ed
Merge "Make battery settings use new battery graph." into nyc-dev
2016-02-18 19:14:14 +00:00
Jason Monk
9cc88e5e5e
Make battery settings use new battery graph.
...
Change-Id: I633a8750f9668c6315cd42866297ac3460375c22
2016-02-18 14:12:32 -05:00
Jason Monk
91c2c96978
Merge "Fix date and time and apn editing" into nyc-dev
2016-02-18 19:11:44 +00:00
mariagpuyol
fe19bc3d4b
Show emergency info preference for all users
...
Change-Id: I8bfcedb8a15c9ca0194f5f526dd288857c19a1de
2016-02-18 10:27:41 -08:00
Anna Galusza
c26916458d
Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev
...
am: 4b67c1a8be
* commit '4b67c1a8be16f7a95759735ed4b714c72b308cac':
Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639
2016-02-18 18:25:11 +00:00
Clara Bayarri
d9f2c849df
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
...
am: 42ed344f4b
* commit '42ed344f4bc4c1a39b08eb60b47ecffe38402860':
Call reportFailedPasswordAttempt from Work Challenge
2016-02-18 18:24:59 +00:00
Anna Galusza
4b67c1a8be
Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev
2016-02-18 17:53:34 +00:00
Clara Bayarri
42ed344f4b
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
2016-02-18 11:16:27 +00:00
Anna Galusza
384fa2e342
Add Screen Zoom preview screen with settings page, launch Talkback tutorial
...
whenever the Talkback setting in SUW is pressed, and remove check for parent
Activity from SettingsPreferenceFragment.
Bug: 26734639
Change-Id: I5671735437844ac54ea68322838d9b6b5c81957f
2016-02-18 01:36:34 +00:00
Shweta Chahar
f7958ecfed
Merge "Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001" into nyc-dev
...
am: f040f80a77
* commit 'f040f80a7740798a25c6570b4446af8292f14226':
Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001
2016-02-18 00:30:32 +00:00
Shweta Chahar
f040f80a77
Merge "Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001" into nyc-dev
2016-02-18 00:15:50 +00:00
Makoto Onuki
b018eedae6
Merge "[Settings] Don\'t allow apps on external storage to be active admin" into nyc-dev
...
am: 4bd2152cbc
* commit '4bd2152cbcef0a73389a89d0d74643e044759087':
[Settings] Don't allow apps on external storage to be active admin
2016-02-17 23:41:35 +00:00
Makoto Onuki
4bd2152cbc
Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev
2016-02-17 22:48:43 +00:00
Jason Monk
d2e75e0528
Fix date and time and apn editing
...
Bug: 27219773
Bug: 25822074
Change-Id: Iec5d56846bf5d3a875180e8907529518949a0d7e
2016-02-17 17:28:46 -05:00
Makoto Onuki
9dbad57a84
[Settings] Don't allow apps on external storage to be active admin
...
Bug 27149287
Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8
2016-02-17 14:18:02 -08:00
Kenny Guy
be893c7f48
Merge "Fix inconsistent use of screenlock" into nyc-dev
...
am: 451ff8e916
* commit '451ff8e916b7a1ff9208bbf7f9330b9db633eac5':
Fix inconsistent use of screenlock
2016-02-17 22:05:04 +00:00
Kenny Guy
451ff8e916
Merge "Fix inconsistent use of screenlock" into nyc-dev
2016-02-17 21:51:53 +00:00