Commit Graph

10053 Commits

Author SHA1 Message Date
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
Geoff Mendal
eb358c233b Merge "Import translations. DO NOT MERGE" 2016-02-22 18:13:49 +00:00
Dan Sandler
7a038ebb1c Enhanced notification details.
Bug: 26919636
Change-Id: I378dc088a6b51e3b33607937c3a12e8d51a97e5e
2016-02-22 12:52:38 -05:00
Geoff Mendal
7f987c75a0 Import translations. DO NOT MERGE
Change-Id: I50559a9a46ebcc59a6b8476b113f6323f84ed1a9
Auto-generated-cl: translation import
2016-02-22 07:46:55 -08:00
Julia Reynolds
571d443927 Merge "Delete topics." into nyc-dev am: 778957cfac
am: 5c34618128

* commit '5c34618128be2fec3d8db36963f9475131adac8b':
  Delete topics.
2016-02-22 15:43:53 +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
Geoff Mendal
9858b225d8 Merge "Revert "Import translations. DO NOT MERGE"" 2016-02-22 15:11:02 +00:00
Geoff Mendal
31843625d3 Revert "Import translations. DO NOT MERGE"
This reverts commit 6c223f1d13.

Change-Id: I958bfa40029b0e0a05cdaba8fa4ad050f574407a
2016-02-22 15:07:22 +00:00
Jason Monk
2078bcc27c Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev am: 4062c3932e
am: 25f0ca889d

* commit '25f0ca889d930731521fb756b2dd5c9d8cf5f764':
  Convert data usage warning/limit to a edit text + dropdown
2016-02-22 15:06:04 +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
Geoff Mendal
6c223f1d13 Import translations. DO NOT MERGE
Change-Id: I4beb7718801e8c5451db86d8f1fff952c7c1e393
Auto-generated-cl: translation import
2016-02-22 06:27:10 -08: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
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
Maurice Lam
e6e5031533 Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev am: 9a6aaebc74
am: 059c0f6e84

* commit '059c0f6e84c0c4223a145e69a28caa717b0e0be6':
  Revert "Revert "Use SetupWizardPreferenceLayout""
2016-02-19 22:19:43 +00: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
5f07334b38 Merge "Rename storage and usb to just storage" into nyc-dev am: 6348dac543
am: 087624719b

* commit '087624719b3244e50a5891c30ba909c40b4406bd':
  Rename storage and usb to just storage
2016-02-19 21:38:54 +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
Sudheer Shanka
a9f39671ea Add disabled by policy empty views to more screens. am: 7dbbe13168
am: dd2210f01c

* commit 'dd2210f01c58d5da7b222f9906af7142517e9019':
  Add disabled by policy empty views to more screens.
2016-02-19 20:37:47 +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
695c0b3055 Merge "Part3 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: 5d8e963c83
am: 2c72056df2

* commit '2c72056df2830045dffa8c0969bc7aacc6b915ae':
  Part3 - Don't add padlock if the restriction is not set by admin.
2016-02-19 19:44:33 +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
Julia Reynolds
2a18cc3a5f Merge "Delete Notification Topics." into nyc-dev am: 929c97e6ac
am: 7c9b814d4a

* commit '7c9b814d4afdb340f6fd56b9c493d1731560b837':
  Delete Notification Topics.
2016-02-19 19:34:39 +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
11408e96aa Merge "Update strings related to policy transparency." into nyc-dev am: 4e02a515d1
am: 77759c2310

* commit '77759c2310c02d4e216c56f2e2ac8c6a2425b19a':
  Update strings related to policy transparency.
2016-02-19 16:41:31 +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
a26ba55840 Merge "add developer setting for multiprocess webview" into nyc-dev am: ab1a97c307
am: 02db2ff667

* commit '02db2ff66797272d38623e9467c45531cfe6529b':
  add developer setting for multiprocess webview
2016-02-19 09:22:18 +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
Udam Saini
44387d8a62 Fixes talkback accessibility on learn more link.
Uses the LinkTextView, which handles partial url talkback
in textviews for accessibility. Also cleans up some string
spacing and changed an instance of Tap & hold to
Touch and hold for clarity.

bug:27171497
bug:26562712
Change-Id: I059a782a952ac962537c374959ee740962d6016f
2016-02-18 15:45:24 -08:00
Maria Garcia Puyol
cf0d7bf0c5 Merge "Show emergency info preference for all users" into nyc-dev am: adcec744b2
am: c4b1a74806

* commit 'c4b1a7480615f828360f34dc3784415809e06d0c':
  Show emergency info preference for all users
2016-02-18 21:11:20 +00:00
Jason Monk
297d195f08 Merge "Make battery settings use new battery graph." into nyc-dev am: fd267eb2ed
am: f40b07becc

* commit 'f40b07becc1596d6eafd3a6d77720ba9a4f3d84f':
  Make battery settings use new battery graph.
2016-02-18 21:11:08 +00:00
Jason Monk
3d6fca52ca Merge "Fix date and time and apn editing" into nyc-dev am: 91c2c96978
am: 41f69453a5

* commit '41f69453a5ebb92f65de4682d7f369fa4df8c456':
  Fix date and time and apn editing
2016-02-18 21:10: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