Commit Graph

25354 Commits

Author SHA1 Message Date
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
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
429f959ef2 Merge "Part2 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: 1b59691855
am: 0a685538fc

* commit '0a685538fc91c86f8b37f26ccea27743f58525b6':
  Part2 - Don't add padlock if the restriction is not set by admin.
2016-02-19 19:44:20 +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
0a685538fc Merge "Part2 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev
am: 1b59691855

* commit '1b596918554489e4c656d244ce1feed44b53b8a8':
  Part2 - Don't add padlock if the restriction is not set by admin.
2016-02-19 19:39:05 +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
Sudheer Shanka
1b59691855 Merge "Part2 - 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
Sudheer Shanka
29737ad910 Part2 - Don't add padlock if the restriction is not set by admin.
Bug: 26687435
Change-Id: I85ef42e1ff1216791d1393a975e8559191b3781f
2016-02-19 19:24:34 +00:00
Julia Reynolds
929c97e6ac Merge "Delete Notification Topics." into nyc-dev 2016-02-19 19:17:24 +00:00
Sudheer Shanka
34de47bd37 Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev am: 69c5f2a10f
am: 305b6b8741

* commit '305b6b87410ed45bc1c88e0ee13e52da2d82b2a3':
  Update ShowAdminSupportDetailsDialog launchmode to singleTop.
2016-02-19 19:08:33 +00:00
Sudheer Shanka
305b6b8741 Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev
am: 69c5f2a10f

* commit '69c5f2a10f5ae522557f5a36982daa41da77a122':
  Update ShowAdminSupportDetailsDialog launchmode to singleTop.
2016-02-19 19:03:28 +00:00
Sudheer Shanka
69c5f2a10f Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev 2016-02-19 18:57:21 +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
Sudheer Shanka
fee4e3e405 Update ShowAdminSupportDetailsDialog launchmode to singleTop.
Bug: 26977320
Change-Id: I8d89ba9243c807657fb4b2b8c93e75aab53d907e
2016-02-19 11:47:53 +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
Anna Galusza
e4937e435b Merge "Don\'t read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006" into nyc-dev am: 18f8712634
am: f853239df4

* commit 'f853239df4f977060468def4d9b884e0adc359a5':
  Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006
2016-02-18 23:58:06 +00:00
Anna Galusza
78b1d99c4f Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev am: 47f3115fbc
am: 83d9b602be

* commit '83d9b602be08445e24bd03e1e4891ab7e406079d':
  Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583
2016-02-18 23:57:48 +00:00
Anna Galusza
f853239df4 Merge "Don\'t read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006" into nyc-dev
am: 18f8712634

* commit '18f87126341e4cef5da4514c57990f7fdf31ed04':
  Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006
2016-02-18 23:51:26 +00:00
Anna Galusza
83d9b602be Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev
am: 47f3115fbc

* commit '47f3115fbc7c22c6c5cd2188533ae7eafe1fa654':
  Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583
2016-02-18 23:51:11 +00:00
Anna Galusza
18f8712634 Merge "Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug: 26967006" into nyc-dev 2016-02-18 23:45:18 +00:00
Anna Galusza
47f3115fbc Merge "Prevent Magnification video from being paused by the user and automatically pause the video on onPause and resume in onResume. b/26984643 b/26705583" into nyc-dev 2016-02-18 23:45:00 +00:00
Christopher Tate
5d32e8cd59 Track IWallpaperManager interface changes am: 672b51ba3b
am: e06bed2521

* commit 'e06bed2521c4effa06db328c1323fe48a8c799aa':
  Track IWallpaperManager interface changes
2016-02-18 23:15:58 +00:00
Christopher Tate
e06bed2521 Track IWallpaperManager interface changes
am: 672b51ba3b

* commit '672b51ba3bb0e8ae7c03af40d466c75ce0c9e1f0':
  Track IWallpaperManager interface changes
2016-02-18 23:08:49 +00:00
Christopher Tate
672b51ba3b Track IWallpaperManager interface changes
Bug 25454162

Change-Id: I7ae64730ff485027462e3e96d32f7190f2d07dc8
2016-02-18 22:57:48 +00:00
Jeff Sharkey
97d06e071b Merge "Avoid division by zero in storage." into nyc-dev am: d1152d86cf
am: 2e90897898

* commit '2e90897898c0ad1c166b41d80c512a3ba1bb81fc':
  Avoid division by zero in storage.
2016-02-18 22:54:43 +00:00
Jeff Sharkey
2e90897898 Merge "Avoid division by zero in storage." into nyc-dev
am: d1152d86cf

* commit 'd1152d86cff31fea37120c979e5f4e87ce43da0c':
  Avoid division by zero in storage.
2016-02-18 22:48:17 +00:00
Jeff Sharkey
d1152d86cf Merge "Avoid division by zero in storage." into nyc-dev 2016-02-18 22:45:07 +00:00
Jeff Sharkey
d36e574cfa Avoid division by zero in storage.
Bug: 26387833
Change-Id: I144475d4b82d91dcfd2271cd775e43d595914cef
2016-02-18 15:43:54 -07:00
Anna Galusza
082d977653 Prevent Magnification video from being paused by the user and automatically
pause the video on onPause and resume in onResume.
b/26984643
b/26705583

Change-Id: I7b805cf001ba3097fec4e7bd178588c3b23b455f
2016-02-18 13:51:27 -08:00
Anna Galusza
e88a05601c Don't read state twice ("on on"/"off off") in Settings Toggle preferences.
Bug: 26967006

Change-Id: I329aabc577ed8b3dc56fe86d9f7bc8f64461c2a0
2016-02-18 13:29:35 -08:00
Alan Viverette
47d764cb34 Round display scaling densities down to the nearest 2 DPI am: 656143240c
am: 86307ffd09

* commit '86307ffd09fb586c7a65c7bd26fe813803246937':
  Round display scaling densities down to the nearest 2 DPI
2016-02-18 21:11:32 +00: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
Alan Viverette
86307ffd09 Round display scaling densities down to the nearest 2 DPI
am: 656143240c

* commit '656143240c1e003cd39141c98548e7f0c625cc14':
  Round display scaling densities down to the nearest 2 DPI
2016-02-18 21:04:50 +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
Alan Viverette
656143240c Round display scaling densities down to the nearest 2 DPI
This will prevent scaling artifacts due to odd densities. We will not
make any adjustments to the "normal" density, which will preserve
tvdpi or whatever the device manufacturer needed to use.

Rounding the density down is always safe, since it will not push us
below our 320dp lower bound on minimum effective screen dimension.

Bug: 27225670
Change-Id: Ib084bb3d4fc70a59106ac74df5394c21e9f8c7bd
2016-02-18 15:56:25 -05: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