Alan Viverette
a12d4791e1
Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev am: 98f5b2ab66
...
am: c64d333316
* commit 'c64d333316f676744bb0338af033fc9430b7fb8a':
Make the screen zoom preview app icon bigger to match Launcher
2016-02-15 20:14:16 +00:00
Alan Viverette
c64d333316
Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev
...
am: 98f5b2ab66
* commit '98f5b2ab66313f82dde2a6eebb2bee2c5b8c5134':
Make the screen zoom preview app icon bigger to match Launcher
2016-02-15 20:07:19 +00:00
Alan Viverette
98f5b2ab66
Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev
2016-02-15 20:02:00 +00:00
Geoff Mendal
1140e6ae8a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10561c0674 -s ours
...
am: 1fee9029eb -s ours
* commit '1fee9029eb5e6b505aae026bd751a5dd0db15e2e':
Import translations. DO NOT MERGE
2016-02-15 16:56:52 +00:00
Geoff Mendal
1fee9029eb
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 10561c0674 -s ours
* commit '10561c06740255534077bcb7afe281a3cc8ab13b':
Import translations. DO NOT MERGE
2016-02-15 16:50:41 +00:00
Geoff Mendal
10561c0674
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-15 16:45:09 +00:00
Geoff Mendal
6ce1e6b0bd
Import translations. DO NOT MERGE am: f99586c789 -s ours am: eb5c74dc48 -s ours
...
am: 5b82f632d6 -s ours
* commit '5b82f632d646d34fe7f20ed961c0949bc0bcc11c':
Import translations. DO NOT MERGE
2016-02-15 15:36:04 +00:00
Geoff Mendal
d6da1965a0
Import translations. DO NOT MERGE
...
Change-Id: I04e3ee5ea3c7c89b94a24ea047077928cc9accb0
Auto-generated-cl: translation import
2016-02-15 07:33:11 -08:00
Geoff Mendal
5b82f632d6
Import translations. DO NOT MERGE am: f99586c789 -s ours
...
am: eb5c74dc48 -s ours
* commit 'eb5c74dc4802a405ba90648433a4509b711e923a':
Import translations. DO NOT MERGE
2016-02-15 15:28:43 +00:00
Geoff Mendal
eb5c74dc48
Import translations. DO NOT MERGE
...
am: f99586c789 -s ours
* commit 'f99586c789bf2c531721f121b5b08425cc14ded5':
Import translations. DO NOT MERGE
2016-02-15 15:19:55 +00:00
Geoff Mendal
f99586c789
Import translations. DO NOT MERGE
...
Change-Id: Ib0959f6786971b40e95c4fa0a23d7bf893ecd5fb
Auto-generated-cl: translation import
2016-02-15 07:15:03 -08:00
Geoff Mendal
405e9dc96b
Import translations. DO NOT MERGE
...
Change-Id: If4c33b7479cfbfac9df168c257a145081274ed1d
Auto-generated-cl: translation import
2016-02-15 06:27:25 -08:00
Svetoslav
e07eb920e6
DO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0 am: 5527ac9cf2 am: 59495dd42a -s ours am: 23ce96c229
...
am: 64d4b94b45 -s ours
* commit '64d4b94b454fad104dde290e19abd119220ac965':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:59:15 +00:00
Svetoslav
64d4b94b45
DO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0 am: 5527ac9cf2 am: 59495dd42a -s ours
...
am: 23ce96c229
* commit '23ce96c2298d51c6dfe86c341562c23f3f5e1436':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:54:44 +00:00
Svetoslav
23ce96c229
DO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0 am: 5527ac9cf2
...
am: 59495dd42a -s ours
* commit '59495dd42a7d613b67af0b579c70b90368e9ce9f':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:50:34 +00:00
Svetoslav
59495dd42a
DO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0
...
am: 5527ac9cf2
* commit '5527ac9cf215fb894153bae8c3bb06fb5264d146':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:38:52 +00:00
Svetoslav
5527ac9cf2
DO NOT MERGE Modify system settings: incorrect UI state
...
am: 2c02228ad0
* commit '2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:28:25 +00:00
Jason Monk
042b5b43df
Fix incorrectly sized app prefs am: 08331aca4e
...
am: 48ee5e20c5
* commit '48ee5e20c535dad57c89ddf18013350c6cdbd2bc':
Fix incorrectly sized app prefs
2016-02-12 21:52:25 +00:00
Jason Monk
48ee5e20c5
Fix incorrectly sized app prefs
...
am: 08331aca4e
* commit '08331aca4e5b994ed26ca12bfceaa1282551359c':
Fix incorrectly sized app prefs
2016-02-12 21:46:15 +00:00
Jason Monk
08331aca4e
Fix incorrectly sized app prefs
...
Bug: 27066871
Change-Id: I0a1a4847532243c27ec5f9d96d8079c417bae91e
2016-02-12 16:31:43 -05:00
Svetoslav
2c02228ad0
DO NOT MERGE Modify system settings: incorrect UI state
...
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d )
(cherry picked from commit 119d589ea5 )
2016-02-12 20:25:18 +00:00
Udam Saini
bcb125f828
Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev am: 6b00d3fe40
...
am: 33a593f325
* commit '33a593f325d034323ab68f63712e8048cd2ae1fd':
Revert "Use SetupWizardPreferenceLayout"
2016-02-12 01:19:49 +00:00
Alan Viverette
557ce43a37
Make the screen zoom preview app icon bigger to match Launcher
...
Bug: 27060024
Change-Id: I0eb58facefa8618331b5109f034d6e0134ad32d8
2016-02-11 15:56:53 -08:00
Udam Saini
33a593f325
Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev
...
am: 6b00d3fe40
* commit '6b00d3fe40b250956724c49302cf2dba4ef4ad05':
Revert "Use SetupWizardPreferenceLayout"
2016-02-11 23:35:43 +00:00
Udam Saini
6b00d3fe40
Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev
2016-02-11 23:32:16 +00:00
Udam Saini
73512ee684
Revert "Use SetupWizardPreferenceLayout"
...
This reverts commit a95e7c3c09 .
This causes a bug where you cannot access fingerprint from settings.
bug:27152471
Change-Id: I4f3078a81b66d44bb6f29ed3afc501e0b56a369e
2016-02-11 23:17:48 +00:00
Makoto Onuki
92e58e7e15
Merge "Use DPM.uninstallPackageWithActiveAdmins()" into nyc-dev am: 4ba3cbbe0e
...
am: 3b0ee3ee3c
* commit '3b0ee3ee3c8695fdacec77a4c8b22f90e188913a':
Use DPM.uninstallPackageWithActiveAdmins()
2016-02-11 20:00:37 +00:00
Makoto Onuki
3b0ee3ee3c
Merge "Use DPM.uninstallPackageWithActiveAdmins()" into nyc-dev
...
am: 4ba3cbbe0e
* commit '4ba3cbbe0ecdb76dc7c06be65b34f506918d3b75':
Use DPM.uninstallPackageWithActiveAdmins()
2016-02-11 19:56:48 +00:00
Makoto Onuki
4ba3cbbe0e
Merge "Use DPM.uninstallPackageWithActiveAdmins()" into nyc-dev
2016-02-11 19:42:56 +00:00
shwetachahar
c229fa6897
Remove \'Higher speech rate\' button based on the results of the speech rate slider a11y UX study. am: 5433496186
...
am: 20975797b7
* commit '20975797b7a0262b9fa65a32766dfdfba93afdb0':
Remove 'Higher speech rate' button based on the results of the speech rate slider a11y UX study.
2016-02-11 17:33:08 +00:00
shwetachahar
20975797b7
Remove \'Higher speech rate\' button based on the results of the speech rate slider a11y UX study.
...
am: 5433496186
* commit '5433496186856aa16a8092801a073e4971a97536':
Remove 'Higher speech rate' button based on the results of the speech rate slider a11y UX study.
2016-02-11 17:21:30 +00:00
shwetachahar
5433496186
Remove 'Higher speech rate' button based on the results of the speech
...
rate slider a11y UX study.
Also, group speech rate, sample sentence synthesis and default language
status into a single preference category as they all fall under the
general TTS settings category.
Bug: 24527715
Change-Id: If7253e2e8a468393afcb4c24f5a775cb9af79db9
2016-02-11 14:58:09 +00:00
Sudheer Shanka
3f7758e2d3
Merge "Disable clear credential option when disallowed by admin." into nyc-dev am: fd9f4511d6
...
am: 77e360d098
* commit '77e360d098e3d4c3e3098db37770dd6c61e4b0ff':
Disable clear credential option when disallowed by admin.
2016-02-11 14:27:04 +00:00
Sudheer Shanka
77e360d098
Merge "Disable clear credential option when disallowed by admin." into nyc-dev
...
am: fd9f4511d6
* commit 'fd9f4511d6b57e234b818df07ec8ab54632189b0':
Disable clear credential option when disallowed by admin.
2016-02-11 14:23:45 +00:00
Sudheer Shanka
fd9f4511d6
Merge "Disable clear credential option when disallowed by admin." into nyc-dev
2016-02-11 14:21:05 +00:00
Maurice Lam
be252bc9b5
Merge "Use SetupWizardPreferenceLayout" into nyc-dev am: 0cfda1ad91
...
am: e56db2bc76
* commit 'e56db2bc7667ebefdb671c532a876d627e7f750f':
Use SetupWizardPreferenceLayout
2016-02-11 01:32:13 +00:00
Maurice Lam
e56db2bc76
Merge "Use SetupWizardPreferenceLayout" into nyc-dev
...
am: 0cfda1ad91
* commit '0cfda1ad9187df570d1cae843fb0c7a49bfdef69':
Use SetupWizardPreferenceLayout
2016-02-11 01:28:16 +00:00
Udam Saini
dc05bf2726
Merge "Fixes stack overflow on some settings preferences" into nyc-dev am: 02ef5603b3
...
am: 3e2a6c705a
* commit '3e2a6c705a36676ee898b5350aa1cc48a65a987e':
Fixes stack overflow on some settings preferences
2016-02-11 01:14:07 +00:00
Makoto Onuki
900bc4b549
Device Admin activation screen: Show buttons vertically. am: dd3e761aa1
...
am: 13db86430b
* commit '13db86430b923024e62aa63d67da4ba48ebc67c0':
Device Admin activation screen: Show buttons vertically.
2016-02-11 01:13:55 +00:00
Maurice Lam
0cfda1ad91
Merge "Use SetupWizardPreferenceLayout" into nyc-dev
2016-02-11 01:07:25 +00:00
Udam Saini
3e2a6c705a
Merge "Fixes stack overflow on some settings preferences" into nyc-dev
...
am: 02ef5603b3
* commit '02ef5603b311e82ce3d849959c26b77723294eb5':
Fixes stack overflow on some settings preferences
2016-02-11 00:40:12 +00:00
Udam Saini
02ef5603b3
Merge "Fixes stack overflow on some settings preferences" into nyc-dev
2016-02-11 00:36:13 +00:00
Udam Saini
6a8b99dabe
Fixes stack overflow on some settings preferences
...
bug:27130222
Change-Id: If273720591ca9a4d10143b36b63eb839e4fa0a4a
2016-02-10 16:35:15 -08:00
Maurice Lam
a95e7c3c09
Use SetupWizardPreferenceLayout
...
Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.
Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1
2016-02-11 00:25:07 +00:00
Makoto Onuki
a31c72511a
Use DPM.uninstallPackageWithActiveAdmins()
...
... so that uninstall won't fail even if the package has
other active admins.
It's pretty much an edge case, so we don't show the
deactivation confirmation in this case.
Bug 27107878
Change-Id: I7e8b0843ac6e39e3db3bfc643eed6940e8577417
2016-02-10 16:23:43 -08:00
Makoto Onuki
13db86430b
Device Admin activation screen: Show buttons vertically.
...
am: dd3e761aa1
* commit 'dd3e761aa1b6cdf992d7ac9127cdfc2b89fd7814':
Device Admin activation screen: Show buttons vertically.
2016-02-11 00:14:03 +00:00
Makoto Onuki
dd3e761aa1
Device Admin activation screen: Show buttons vertically.
...
Bug 25392386
Change-Id: Ie7e7ff107af3c307d99818b4c9a5e1b95fa329f2
2016-02-10 16:09:16 -08:00
Suprabh Shukla
c94f2fa6b3
Merge "Adding an easy uninstall for active device admin" into nyc-dev am: eee6c2c8b7
...
am: 8388a272a6
* commit '8388a272a6b7dc43337531a7a8f4a227b698a57e':
Adding an easy uninstall for active device admin
2016-02-10 23:28:00 +00:00
Suprabh Shukla
8388a272a6
Merge "Adding an easy uninstall for active device admin" into nyc-dev
...
am: eee6c2c8b7
* commit 'eee6c2c8b7a709a0ba6e221c7b52661e539e4afa':
Adding an easy uninstall for active device admin
2016-02-10 23:14:10 +00:00
Suprabh Shukla
eee6c2c8b7
Merge "Adding an easy uninstall for active device admin" into nyc-dev
2016-02-10 22:58:30 +00:00