OSDN Git Service
Alan Viverette [Mon, 22 Feb 2016 20:47:33 +0000 (20:47 +0000)]
Merge "Remove night mode from developer settings" into nyc-dev
am:
f4ace6fe91
* commit '
f4ace6fe91726665715312b0b0ec22a4ba360b61':
Remove night mode from developer settings
Chris Tate [Mon, 22 Feb 2016 20:47:15 +0000 (20:47 +0000)]
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"
Jason Monk [Mon, 22 Feb 2016 20:46:59 +0000 (20:46 +0000)]
Merge "Fix data usage multi-sim stuff" into nyc-dev
am:
2dd744f824
* commit '
2dd744f824cfb07298ef7bba84cfd4ede84b8316':
Fix data usage multi-sim stuff
Alan Viverette [Mon, 22 Feb 2016 20:43:59 +0000 (20:43 +0000)]
Merge "Remove night mode from developer settings" into nyc-dev
Chris Tate [Mon, 22 Feb 2016 20:43:38 +0000 (20:43 +0000)]
Merge "Text: "...and other URLs" rather than "...and related URLs"" into nyc-dev
Jason Monk [Mon, 22 Feb 2016 20:38:57 +0000 (20:38 +0000)]
Merge "Fix data usage multi-sim stuff" into nyc-dev
Christopher Tate [Mon, 22 Feb 2016 20:28:19 +0000 (12:28 -0800)]
Text: "...and other URLs" rather than "...and related URLs"
Bug
26692609
Change-Id: Ibb4f44950f03d66df161aee2e0661b9db57b031f
Jason Monk [Mon, 22 Feb 2016 20:29:16 +0000 (20:29 +0000)]
Merge "Fix wallpaper prefs being too tall" into nyc-dev
am:
3795d708ce
* commit '
3795d708ce8a6898ef75f5e601f39b34840d80e8':
Fix wallpaper prefs being too tall
Jason Monk [Mon, 22 Feb 2016 20:22:37 +0000 (20:22 +0000)]
Merge "Fix wallpaper prefs being too tall" into nyc-dev
Jason Monk [Mon, 22 Feb 2016 20:21:45 +0000 (15:21 -0500)]
Fix wallpaper prefs being too tall
Change-Id: Iddb45c77eb5014a596e9f94e3a2a9065165b2711
Jason Monk [Mon, 22 Feb 2016 20:04:57 +0000 (15:04 -0500)]
Fix data usage multi-sim stuff
Bug:
26866568
Change-Id: I5d1a6547124c1744af7e30c5a02b46ca07cc81e8
Alan Viverette [Mon, 22 Feb 2016 18:47:50 +0000 (13:47 -0500)]
Remove night mode from developer settings
It's in SysUI Tuner now.
Change-Id: If1c248bfaa964b4f37155619a4c54f836d33e468
Geoff Mendal [Mon, 22 Feb 2016 16:26:40 +0000 (16:26 +0000)]
Import translations. DO NOT MERGE
am:
0cb45a495e -s ours
* commit '
0cb45a495e0ea24bd03a4f95f076c130ce46c4f1':
Import translations. DO NOT MERGE
Julia Reynolds [Mon, 22 Feb 2016 15:37:24 +0000 (15:37 +0000)]
Merge "Delete topics." into nyc-dev
am:
778957cfac
* commit '
778957cfaca203fffa7e7eb7f891b9661d50d216':
Delete topics.
Geoff Mendal [Mon, 22 Feb 2016 15:32:39 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91a9aabb3a7378e68234fa42fb5ffdb999c8235e
Auto-generated-cl: translation import
Julia Reynolds [Mon, 22 Feb 2016 15:23:45 +0000 (15:23 +0000)]
Merge "Delete topics." into nyc-dev
Julia Reynolds [Mon, 22 Feb 2016 15:20:01 +0000 (10:20 -0500)]
Delete topics.
Bug:
23220370
Change-Id: Ib1bc26183f00685b6547d5ffe37ce149c31fe153
Jason Monk [Mon, 22 Feb 2016 15:11:52 +0000 (15:11 +0000)]
Merge "Fix background data setting being backwords" into nyc-dev
am:
60df76b169
* commit '
60df76b169c7d341130265a99a23bbfa63934f9c':
Fix background data setting being backwords
Jason Monk [Mon, 22 Feb 2016 15:04:46 +0000 (15:04 +0000)]
Merge "Fix background data setting being backwords" into nyc-dev
Jason Monk [Mon, 22 Feb 2016 14:59:47 +0000 (14:59 +0000)]
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
Jason Monk [Mon, 22 Feb 2016 14:57:51 +0000 (14:57 +0000)]
Merge "Convert data usage warning/limit to a edit text + dropdown" into nyc-dev
Gustav Sennton [Mon, 22 Feb 2016 10:12:35 +0000 (10:12 +0000)]
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.
Gustav Sennton [Mon, 22 Feb 2016 10:10:13 +0000 (10:10 +0000)]
Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev
Jason Monk [Sun, 21 Feb 2016 16:53:36 +0000 (11:53 -0500)]
Fix background data setting being backwords
Bug:
27250166
Change-Id: Ia8ef4b0ab860e6c15d972a32c7918b2d54f7743b
Jason Monk [Sun, 21 Feb 2016 16:39:42 +0000 (11:39 -0500)]
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
Jason Monk [Sun, 21 Feb 2016 14:41:36 +0000 (14:41 +0000)]
Add generic logging to Settings switch bar
am:
e4ebcd12be
* commit '
e4ebcd12be7baae58a1fabcda6c7544c911c95eb':
Add generic logging to Settings switch bar
Jason Monk [Sun, 21 Feb 2016 14:37:41 +0000 (09:37 -0500)]
Add generic logging to Settings switch bar
Same usage/format as the shared preference logging.
Bug:
27043208
Change-Id: I7a7a5c0a9c92ec6cef50df58313016218cf2f2f7
Samuel Tan [Sat, 20 Feb 2016 00:23:46 +0000 (00:23 +0000)]
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
Samuel Tan [Sat, 20 Feb 2016 00:12:03 +0000 (00:12 +0000)]
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
Maurice Lam [Fri, 19 Feb 2016 22:13:34 +0000 (22:13 +0000)]
Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev
am:
9a6aaebc74
* commit '
9a6aaebc74f6e88eec2a220f01331d9e32ba9448':
Revert "Revert "Use SetupWizardPreferenceLayout""
Maurice Lam [Fri, 19 Feb 2016 22:03:41 +0000 (22:03 +0000)]
Merge "Revert "Revert "Use SetupWizardPreferenceLayout""" into nyc-dev
Jason Monk [Fri, 19 Feb 2016 21:33:51 +0000 (21:33 +0000)]
Merge "Rename storage and usb to just storage" into nyc-dev
am:
6348dac543
* commit '
6348dac5436f7d9aa2f54af7a2c077004870bee1':
Rename storage and usb to just storage
Jason Monk [Fri, 19 Feb 2016 21:26:00 +0000 (21:26 +0000)]
Merge "Rename storage and usb to just storage" into nyc-dev
Jason Monk [Fri, 19 Feb 2016 20:32:33 +0000 (15:32 -0500)]
Rename storage and usb to just storage
Bug:
23840185
Change-Id: If0ea6be5a43b8aea1b49c46f3f95a92bef05aaf7
Sudheer Shanka [Fri, 19 Feb 2016 20:30:02 +0000 (20:30 +0000)]
Add disabled by policy empty views to more screens.
am:
7dbbe13168
* commit '
7dbbe131683c231f6820bca4d67853649a4836f8':
Add disabled by policy empty views to more screens.
Sudheer Shanka [Tue, 16 Feb 2016 14:19:32 +0000 (14:19 +0000)]
Add disabled by policy empty views to more screens.
Bug:
27214401
Change-Id: I6cd4292a63610671070bf2134105e9e348c3ab32
Sudheer Shanka [Fri, 19 Feb 2016 19:39:21 +0000 (19:39 +0000)]
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.
Sudheer Shanka [Fri, 19 Feb 2016 19:39:05 +0000 (19:39 +0000)]
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.
Sudheer Shanka [Fri, 19 Feb 2016 19:31:44 +0000 (19:31 +0000)]
Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev
Sudheer Shanka [Fri, 19 Feb 2016 19:31:44 +0000 (19:31 +0000)]
Merge "Part2 - Don't add padlock if the restriction is not set by admin." into nyc-dev
Julia Reynolds [Fri, 19 Feb 2016 19:26:59 +0000 (19:26 +0000)]
Merge "Delete Notification Topics." into nyc-dev
am:
929c97e6ac
* commit '
929c97e6acf725df87456ad053ee47df47c921aa':
Delete Notification Topics.
Sudheer Shanka [Thu, 11 Feb 2016 17:17:21 +0000 (17:17 +0000)]
Part2 - Don't add padlock if the restriction is not set by admin.
Bug:
26687435
Change-Id: I85ef42e1ff1216791d1393a975e8559191b3781f
Julia Reynolds [Fri, 19 Feb 2016 19:17:23 +0000 (19:17 +0000)]
Merge "Delete Notification Topics." into nyc-dev
Sudheer Shanka [Fri, 19 Feb 2016 19:03:28 +0000 (19:03 +0000)]
Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev
am:
69c5f2a10f
* commit '
69c5f2a10f5ae522557f5a36982daa41da77a122':
Update ShowAdminSupportDetailsDialog launchmode to singleTop.
Sudheer Shanka [Fri, 19 Feb 2016 18:57:20 +0000 (18:57 +0000)]
Merge "Update ShowAdminSupportDetailsDialog launchmode to singleTop." into nyc-dev
Samuel Tan [Thu, 18 Feb 2016 22:56:10 +0000 (14:56 -0800)]
WifiConfigController: set ca_path and ca_cert to null if unused
The WPA supplicant ca_cert and ca_path directives should not
both be non-null, since our EAP settings logic only allows one
or the other to be used.
Modify logic in getConfig() to explicitly set ca_path or ca_cert
to null if it is not used. This explicit null value is necessary
to override a previously non-null value saved in an existing
configuration.
Also, always set the domain_suffix_match directive, which
will lead to this directive to be reset when the Domain
field is hidden.
BUG:
27194668
TEST: 1) Install custom ca certificate onto device as "testcert"
TEST: 2) Configure an EAP-TLS network with CA certificate
"testcert", Domain "testdomain",
User certificate "Do not provide", identity empty, and save.
TEST: 3) Read network variables in data/misc/wifi/wpa_supplicant.conf
and ensure that ca_cert is "testcert", ca_path is not
present, and domain_suffix_match is "testdomain".
TEST: 4) Modify that same EAP-TLS network configured in step 2 with
CA certificate "Use system certificates", Domain "testdomain",
User certificate "Do not provide", identity empty, and save.
TEST: 5) Read network variables in data/misc/wifi/wpa_supplicant.eonf
and ensure that ca_cert is "keystore://CACERT_testcert",
ca_path is not present, and domain_suffix_match is
"testdomain".
TEST: 6) Modify that same EAP-TLS network configured in step 2 to be
an EAP-PWD network. Leave Identity and Password blank, and
save.
TEST: 7) Read network variables in data/misc/wifi/wpa_supplicant.eonf
and ensure that ca_cert, ca_path, and domain_suffix_match are
not present.
Change-Id: I547f3e359bc8e9b77e51e10e60356b857230636f
Sudheer Shanka [Fri, 19 Feb 2016 16:36:53 +0000 (16:36 +0000)]
Merge "Update strings related to policy transparency." into nyc-dev
am:
4e02a515d1
* commit '
4e02a515d1c75b75a4fa2d515174d9b50a7e64c8':
Update strings related to policy transparency.
Sudheer Shanka [Fri, 19 Feb 2016 16:33:30 +0000 (16:33 +0000)]
Merge "Update strings related to policy transparency." into nyc-dev
Sudheer Shanka [Thu, 18 Feb 2016 17:48:01 +0000 (17:48 +0000)]
Update ShowAdminSupportDetailsDialog launchmode to singleTop.
Bug:
26977320
Change-Id: I8d89ba9243c807657fb4b2b8c93e75aab53d907e
Toby Sargeant [Fri, 19 Feb 2016 09:18:27 +0000 (09:18 +0000)]
Merge "add developer setting for multiprocess webview" into nyc-dev
am:
ab1a97c307
* commit '
ab1a97c30766b15a541a9bee35f853ffd8fefcca':
add developer setting for multiprocess webview
Toby Sargeant [Fri, 19 Feb 2016 09:14:55 +0000 (09:14 +0000)]
Merge "add developer setting for multiprocess webview" into nyc-dev
Anna Galusza [Thu, 18 Feb 2016 23:51:26 +0000 (23:51 +0000)]
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
Anna Galusza [Thu, 18 Feb 2016 23:51:11 +0000 (23:51 +0000)]
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
Anna Galusza [Thu, 18 Feb 2016 23:45:17 +0000 (23:45 +0000)]
Merge "Don't read state twice ("on on"/"off off") in Settings Toggle preferences. Bug:
26967006" into nyc-dev
Anna Galusza [Thu, 18 Feb 2016 23:45:00 +0000 (23:45 +0000)]
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
Christopher Tate [Thu, 18 Feb 2016 23:08:49 +0000 (23:08 +0000)]
Track IWallpaperManager interface changes
am:
672b51ba3b
* commit '
672b51ba3bb0e8ae7c03af40d466c75ce0c9e1f0':
Track IWallpaperManager interface changes
Christopher Tate [Thu, 11 Feb 2016 03:38:29 +0000 (19:38 -0800)]
Track IWallpaperManager interface changes
Bug
25454162
Change-Id: I7ae64730ff485027462e3e96d32f7190f2d07dc8
Jeff Sharkey [Thu, 18 Feb 2016 22:48:17 +0000 (22:48 +0000)]
Merge "Avoid division by zero in storage." into nyc-dev
am:
d1152d86cf
* commit '
d1152d86cff31fea37120c979e5f4e87ce43da0c':
Avoid division by zero in storage.
Jeff Sharkey [Thu, 18 Feb 2016 22:45:07 +0000 (22:45 +0000)]
Merge "Avoid division by zero in storage." into nyc-dev
Jeff Sharkey [Thu, 18 Feb 2016 22:43:54 +0000 (15:43 -0700)]
Avoid division by zero in storage.
Bug:
26387833
Change-Id: I144475d4b82d91dcfd2271cd775e43d595914cef
Anna Galusza [Wed, 17 Feb 2016 23:18:15 +0000 (15:18 -0800)]
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
Anna Galusza [Thu, 18 Feb 2016 21:26:29 +0000 (13:26 -0800)]
Don't read state twice ("on on"/"off off") in Settings Toggle preferences.
Bug:
26967006
Change-Id: I329aabc577ed8b3dc56fe86d9f7bc8f64461c2a0
Alan Viverette [Thu, 18 Feb 2016 21:04:50 +0000 (21:04 +0000)]
Round display scaling densities down to the nearest 2 DPI
am:
656143240c
* commit '
656143240c1e003cd39141c98548e7f0c625cc14':
Round display scaling densities down to the nearest 2 DPI
Maria Garcia Puyol [Thu, 18 Feb 2016 21:04:38 +0000 (21:04 +0000)]
Merge "Show emergency info preference for all users" into nyc-dev
am:
adcec744b2
* commit '
adcec744b2699a54db5606e9a50a08c6fb243a0e':
Show emergency info preference for all users
Jason Monk [Thu, 18 Feb 2016 21:04:28 +0000 (21:04 +0000)]
Merge "Make battery settings use new battery graph." into nyc-dev
am:
fd267eb2ed
* commit '
fd267eb2ed842c29225a9ef0d7fcf45733263a99':
Make battery settings use new battery graph.
Jason Monk [Thu, 18 Feb 2016 21:04:17 +0000 (21:04 +0000)]
Merge "Fix date and time and apn editing" into nyc-dev
am:
91c2c96978
* commit '
91c2c96978fe9b5554a1ad16e26765e14cffca12':
Fix date and time and apn editing
Alan Viverette [Thu, 18 Feb 2016 20:56:25 +0000 (15:56 -0500)]
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
Maria Garcia Puyol [Thu, 18 Feb 2016 19:19:04 +0000 (19:19 +0000)]
Merge "Show emergency info preference for all users" into nyc-dev
Jason Monk [Thu, 18 Feb 2016 19:14:13 +0000 (19:14 +0000)]
Merge "Make battery settings use new battery graph." into nyc-dev
Jason Monk [Wed, 17 Feb 2016 13:53:10 +0000 (08:53 -0500)]
Make battery settings use new battery graph.
Change-Id: I633a8750f9668c6315cd42866297ac3460375c22
Jason Monk [Thu, 18 Feb 2016 19:11:43 +0000 (19:11 +0000)]
Merge "Fix date and time and apn editing" into nyc-dev
mariagpuyol [Thu, 18 Feb 2016 03:23:24 +0000 (19:23 -0800)]
Show emergency info preference for all users
Change-Id: I8bfcedb8a15c9ca0194f5f526dd288857c19a1de
Anna Galusza [Thu, 18 Feb 2016 18:25:11 +0000 (18:25 +0000)]
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
Clara Bayarri [Thu, 18 Feb 2016 18:24:59 +0000 (18:24 +0000)]
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
am:
42ed344f4b
* commit '
42ed344f4bc4c1a39b08eb60b47ecffe38402860':
Call reportFailedPasswordAttempt from Work Challenge
Anna Galusza [Thu, 18 Feb 2016 17:53:33 +0000 (17:53 +0000)]
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
Clara Bayarri [Thu, 18 Feb 2016 11:16:26 +0000 (11:16 +0000)]
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
Anna Galusza [Wed, 3 Feb 2016 23:51:12 +0000 (15:51 -0800)]
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
Shweta Chahar [Thu, 18 Feb 2016 00:30:32 +0000 (00:30 +0000)]
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
Shweta Chahar [Thu, 18 Feb 2016 00:15:50 +0000 (00:15 +0000)]
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
Makoto Onuki [Wed, 17 Feb 2016 23:41:35 +0000 (23:41 +0000)]
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
Makoto Onuki [Wed, 17 Feb 2016 22:48:42 +0000 (22:48 +0000)]
Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev
Jason Monk [Wed, 17 Feb 2016 22:27:23 +0000 (17:27 -0500)]
Fix date and time and apn editing
Bug:
27219773
Bug:
25822074
Change-Id: Iec5d56846bf5d3a875180e8907529518949a0d7e
Makoto Onuki [Wed, 17 Feb 2016 19:15:04 +0000 (11:15 -0800)]
[Settings] Don't allow apps on external storage to be active admin
Bug
27149287
Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8
Kenny Guy [Wed, 17 Feb 2016 22:05:04 +0000 (22:05 +0000)]
Merge "Fix inconsistent use of screenlock" into nyc-dev
am:
451ff8e916
* commit '
451ff8e916b7a1ff9208bbf7f9330b9db633eac5':
Fix inconsistent use of screenlock
Tony Mak [Wed, 17 Feb 2016 21:56:32 +0000 (21:56 +0000)]
Merge "Home default setting should not shown in managed profile settings" into nyc-dev
am:
6e7cfdda79
* commit '
6e7cfdda7975a737268f8a7281da5186d3ad2201':
Home default setting should not shown in managed profile settings
Kenny Guy [Wed, 17 Feb 2016 21:51:53 +0000 (21:51 +0000)]
Merge "Fix inconsistent use of screenlock" into nyc-dev
Tony Mak [Wed, 17 Feb 2016 21:43:02 +0000 (21:43 +0000)]
Merge "Home default setting should not shown in managed profile settings" into nyc-dev
Tobias Sargeant [Thu, 11 Feb 2016 14:52:38 +0000 (14:52 +0000)]
add developer setting for multiprocess webview
Change-Id: I9cd547ad4168b56b8b5c9eab9e2407daea74a30e
Bill Yi [Wed, 17 Feb 2016 21:06:50 +0000 (21:06 +0000)]
Kenny Guy [Wed, 17 Feb 2016 20:49:45 +0000 (20:49 +0000)]
Fix inconsistent use of screenlock
Change screenlock to screen lock
to be consistent.
Bug:
26635057
Change-Id: I4cb06cd2dcea0499a232ed3f28a7dbbf3598c9e9
Noah Wang [Wed, 17 Feb 2016 20:36:47 +0000 (20:36 +0000)]
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
Noah Wang [Wed, 17 Feb 2016 20:20:01 +0000 (20:20 +0000)]
Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev
Tao Bao [Wed, 17 Feb 2016 20:15:26 +0000 (20:15 +0000)]
Merge "Add a Developer option of "Disable automatic update"." into nyc-dev
am:
28dfd93b14
* commit '
28dfd93b1473dcc47189d1cbcda3cf6e94e6c49d':
Add a Developer option of "Disable automatic update".
Julia Reynolds [Fri, 12 Feb 2016 14:17:37 +0000 (09:17 -0500)]
Delete Notification Topics.
Bug:
23220370
Change-Id: I072b68650af35ae3d5c5ccf6222dc31f5f36f9bb
Sudheer Shanka [Wed, 17 Feb 2016 18:06:52 +0000 (18:06 +0000)]
Update strings related to policy transparency.
Bug:
25603665
Change-Id: I1eb46979fbb1e1562a165a9879ac0106ff689bd3
Tao Bao [Wed, 17 Feb 2016 20:06:51 +0000 (20:06 +0000)]
Merge "Add a Developer option of "Disable automatic update"." into nyc-dev
Noah Wang [Fri, 5 Feb 2016 03:11:33 +0000 (19:11 -0800)]
Create messenger preview screen for magnification gesture
settings screen
Change-Id: I4824c370388c4996e233c87005879d4818cfd59e
Bill Yi [Wed, 17 Feb 2016 19:13:33 +0000 (11:13 -0800)]
Merge commit '
6a19c5cabf1615ffce654a1203554bbaa1d1f72e' into HEAD
Change-Id: Ic7cd65ff8d2fd397a77f635b21bd06bfc17a38dc
Tao Bao [Tue, 16 Feb 2016 04:03:22 +0000 (20:03 -0800)]
Add a Developer option of "Disable automatic update".
For devices using A/B update or update-on-boot feature, we need a
Developer option to prevent the system updates from being installed
automatically.
We store the "disabled" status internally to turn on the automatic
update by default. But we show the opposite "enabled" status on screen
based on UX comments.
Bug:
27193001
Change-Id: I36a08a2a08fd1ba0f8f3c4b3ae5a08dc50829cd2
Geoff Mendal [Wed, 17 Feb 2016 17:41:31 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE am:
7efa356849 -s ours
am:
7b54a8154e -s ours
* commit '
7b54a8154e4b1926f07f7ac37cf9997efc4134ca':
Import translations. DO NOT MERGE
OSDN Git Service
