Maurice Lam
d4fa7aa48c
am bec1d295
: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit 'bec1d295586b752f81f523c8339dcd49c586d722':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:27:58 +00:00
Maurice Lam
bec1d29558
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
2015-07-16 02:19:19 +00:00
Jason Monk
94b7585895
am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '509726054a3efc09d65d6c15f485ea6f1da2d272':
Disable ignore battery optimization items that can't change
2015-07-15 23:01:53 +00:00
Jason Monk
5fa374cc20
am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '4a6b909559d50e02833afd5119876df070dfd458':
Change move storage from dropdown pref to dialog
2015-07-15 23:01:51 +00:00
Jason Monk
509726054a
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
2015-07-15 22:48:06 +00:00
Jason Monk
e8400c2fb7
Change move storage from dropdown pref to dialog
...
Use a horizontal pref and a single button that triggers the dialog
Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
2015-07-15 16:59:28 -04:00
Maurice Lam
58a6af1496
am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 19:38:05 +00:00
Jim Miller
2a414b9368
am 6b9d7889
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
Fixed the layout for the fingerprint renaming
2015-07-15 19:30:55 +00:00
Maurice Lam
4595978b72
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
2015-07-15 19:28:06 +00:00
Jason Monk
443513cc0d
Disable ignore battery optimization items that can't change
...
Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
2015-07-15 15:22:38 -04:00
Jim Miller
6b9d788914
Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
2015-07-15 19:18:06 +00:00
Maurice Lam
d7be0656ff
am f90628c6
: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
...
* commit 'f90628c6ec8cf80b44b9559db448eb9537b41fdc':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-15 18:55:57 +00:00
Maurice Lam
f90628c6ec
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
2015-07-15 18:45:34 +00:00
Maurice Lam
8d1f9c9be5
[Fingerprint] Add fingerprint enroll in setup wizard
...
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
2015-07-15 11:14:22 -07:00
Maurice Lam
e1eaed079c
[Fingerprint] Export FingerprintEnrollIntroduction
...
Export FingerprintEnrollIntroduction activity under the permission
MANAGE_FINGERPRINT so that setup wizard can start it.
Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
(cherry picked from commit 052297172e
)
2015-07-15 11:09:25 -07:00
Selim Cinek
854d08be2b
Fixed the layout for the fingerprint renaming
...
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit abd67de1ad
)
2015-07-15 17:37:46 +00:00
Kenny Guy
9854dfaf1d
Show disabled trust agents as off.
...
When trust agents are disabled by the admin
show the greyed out toggle as off.
Bug: 22397930
Change-Id: I687a5dee0ca9bed5015a4af080270f7bafa5a37d
2015-07-15 16:12:34 +00:00
Jason Monk
4a3819027a
am cd075edf
: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
...
* commit 'cd075edf6dcff9ca9ff243760e032190acbdecdc':
Fix Help menu for PrivateVolumeSettings
2015-07-15 15:07:21 +00:00
Jason Monk
cd075edf6d
Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
2015-07-15 14:54:04 +00:00
Geoff Mendal
e187578309
am f3907176
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f3907176da3f17397f61bf48ba90ab08a9cd85f3':
Import translations. DO NOT MERGE
2015-07-15 14:07:29 +00:00
Geoff Mendal
f3907176da
Import translations. DO NOT MERGE
...
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
2015-07-15 06:56:45 -07:00
Narayan Kamath
45e1e1ec92
am 83a25842
: Merge "Lose some deprecated test annotations."
...
* commit '83a25842e720ddb838519e194679b464d0114301':
Lose some deprecated test annotations.
2015-07-14 22:52:58 +00:00
xinhe
e9c822b0c6
am d7fb46de
: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
...
* commit 'd7fb46de591943c402dd13551ca603081ac4e6a7':
Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 22:40:35 +00:00
xinhe
d7fb46de59
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
2015-07-14 22:29:32 +00:00
xinhe
cbdcca6cf6
Need to disable 5GHz bands for WiFi tethering in Japan
...
b/22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
2015-07-14 14:39:43 -07:00
Jim Miller
52374856e8
am e641e7d7
: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
...
* commit 'e641e7d706095b54ac89f6fcb58c66e2190f46c7':
Postpone call to postEnroll() until we actually leave activity.
2015-07-14 21:14:59 +00:00
Jim Miller
e641e7d706
Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev
2015-07-14 21:02:02 +00:00
Jason Monk
810448204f
am acc70a3a
: Merge "Add content description to wifi networks" into mnc-dev
...
* commit 'acc70a3a3262aef48b2efab90f14328f818a9aef':
Add content description to wifi networks
2015-07-14 20:31:52 +00:00
Jason Monk
acc70a3a32
Merge "Add content description to wifi networks" into mnc-dev
2015-07-14 20:20:40 +00:00
Jason Monk
f05248f88f
Fix Help menu for PrivateVolumeSettings
...
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.
Bug: 22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
2015-07-14 15:00:22 -04:00
Billy Lau
45b27c3a04
am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 18:37:09 +00:00
Billy Lau
52df60d83d
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
2015-07-14 18:22:30 +00:00
Sanket Padawe
c06f9b6721
Use common xml file for multi-tab settings.
...
Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
2015-07-14 11:13:43 -07:00
Jorim Jaggi
8f37d4bc11
am 8505d4a5
: Merge "Disable voice input if assist is voice service" into mnc-dev
...
* commit '8505d4a51d1112ea71f7df680cf85378a9567bde':
Disable voice input if assist is voice service
2015-07-14 18:05:05 +00:00
Jason Monk
2ecd295d56
Add content description to wifi networks
...
Bug: 22468835
Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
2015-07-14 14:00:07 -04:00
Jorim Jaggi
8505d4a51d
Merge "Disable voice input if assist is voice service" into mnc-dev
2015-07-14 17:50:34 +00:00
Jason Monk
31e0538651
am 7713fe26
: Merge "Disable notification volume when user restricted" into mnc-dev
...
* commit '7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
Disable notification volume when user restricted
2015-07-14 14:04:12 +00:00
Jason Monk
7713fe26d2
Merge "Disable notification volume when user restricted" into mnc-dev
2015-07-14 13:53:29 +00:00
Narayan Kamath
83a25842e7
Merge "Lose some deprecated test annotations."
2015-07-14 10:48:09 +00:00
Martijn Coenen
90d21f0967
am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
Fix up Tap and Pay how it works.
2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d
Merge "Fix up Tap and Pay how it works." into mnc-dev
2015-07-14 07:45:01 +00:00
Jorim Jaggi
0798ef0523
Disable voice input if assist is voice service
...
Bug: 22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
2015-07-14 04:13:57 +00:00
Maurice Lam
9fa8d9f248
[Fingerprint] Use accent color for fingerprint highlight
...
Set the fingerprint activated color, while registering a new
fingerprint to be 50% alpha of the accent color. This allows the
color to be changed with the theme, so that it will be highlighted
blue during setup wizard.
Bug: 21695577
Change-Id: Iee68506a4fbb8e8996bdb52694992ac460ae943d
2015-07-14 01:22:38 +00:00
Jim Miller
e9785ac1e4
Postpone call to postEnroll() until we actually leave activity.
...
The existing code was calling postEnroll() too soon, which resulted
in the inability to add more than one fingerprint. The solution is to
only call postEnroll() when we're leaving the activity.
Fixes bug 22438498
Change-Id: Ia134899e12b4edc9cced834e99cb2bfd2d51321f
2015-07-13 16:00:25 -07:00
Billy Lau
7f70ba18e6
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
...
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
2015-07-13 22:39:49 +01:00
Jason Monk
26cc9fcf66
Disable notification volume when user restricted
...
Bug: 22327825
Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
2015-07-13 15:15:36 -04:00
Jason Monk
34e7b4cd05
am 53dd1d4d
: Merge "Fix app icon size" into mnc-dev
...
* commit '53dd1d4deea9968f1255018248ff0393252032dd':
Fix app icon size
2015-07-13 18:12:35 +00:00
Jason Monk
53dd1d4dee
Merge "Fix app icon size" into mnc-dev
2015-07-13 18:05:54 +00:00
Sanket Padawe
c319bac558
am 7995ca41
: Use same technology type for LTE/4G
...
* commit '7995ca4165cae43b9bff25a6e6eafdb51445b698':
Use same technology type for LTE/4G
2015-07-13 17:36:19 +00:00