Commit Graph

8572 Commits

Author SHA1 Message Date
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
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
Anna Galusza
0fa9b2dcf1 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
am: c26916458d

* commit 'c26916458d965c3caac849026c1ba358c015c2e6':
  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:34:20 +00:00
Clara Bayarri
ebdf9af1dd Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev am: 42ed344f4b
am: d9f2c849df

* commit 'd9f2c849df066b067069cbb2e2cb13ea2764ac8e':
  Call reportFailedPasswordAttempt from Work Challenge
2016-02-18 18:34:08 +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
42b512f389 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
am: f7958ecfed

* commit 'f7958ecfeda14a5d698ef17c838b56b900ba49c1':
  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:35:17 +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
f03dbe4c3f Merge "[Settings] Don\'t allow apps on external storage to be active admin" into nyc-dev am: 4bd2152cbc
am: b018eedae6

* commit 'b018eedae699a4581632b20b2656ccb5cde23491':
  [Settings] Don't allow apps on external storage to be active admin
2016-02-17 23:49:32 +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
Kenny Guy
fb75c2219e Merge "Fix inconsistent use of screenlock" into nyc-dev am: 451ff8e916
am: be893c7f48

* commit 'be893c7f483b66475c1a7915b66cca6e92436e77':
  Fix inconsistent use of screenlock
2016-02-17 22:19:48 +00: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
Tobias Sargeant
f8364f597b add developer setting for multiprocess webview
Change-Id: I9cd547ad4168b56b8b5c9eab9e2407daea74a30e
2016-02-17 21:07:54 +00:00
Noah Wang
1cb028bc65 Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev am: 2bf0f59048
am: aebb3338ea

* commit 'aebb3338ead9bde99b55665446540bce2f945b5a':
  Create messenger preview screen for magnification gesture settings screen
2016-02-17 20:52:19 +00:00
Kenny Guy
9de8c4625a Fix inconsistent use of screenlock
Change screenlock to screen lock
to be consistent.

Bug: 26635057
Change-Id: I4cb06cd2dcea0499a232ed3f28a7dbbf3598c9e9
2016-02-17 20:49:45 +00:00
Noah Wang
aebb3338ea Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev
am: 2bf0f59048

* commit '2bf0f59048c82f99bfaafcfb0ff0f9a5ff0cd0e8':
  Create messenger preview screen for magnification gesture settings screen
2016-02-17 20:36:47 +00:00
Tao Bao
208ac00d29 Merge "Add a Developer option of "Disable automatic update"." into nyc-dev am: 28dfd93b14
am: bc89cb0ac2

* commit 'bc89cb0ac2d890bfcd1415f5ca8b158e312f3af6':
  Add a Developer option of "Disable automatic update".
2016-02-17 20:24:05 +00:00