OSDN Git Service
Geoff Mendal [Fri, 24 Jul 2015 01:40:16 +0000 (01:40 +0000)]
am
5376d54e: (-s ours) Import translations. DO NOT MERGE
* commit '
5376d54e8eccc45586e5225b6ec7d6637399270f':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 01:10:24 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
Svetoslav Ganov [Thu, 23 Jul 2015 22:42:28 +0000 (22:42 +0000)]
am
cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '
cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
Reset permissions and app links when clearing app preferences - settings
Jason Monk [Thu, 23 Jul 2015 22:42:06 +0000 (22:42 +0000)]
am
8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '
8bf5f3075e6e0797e96a861330b7ff82eee88bee':
Fix battery detail issues with "Android OS"
Jason Monk [Thu, 23 Jul 2015 22:42:05 +0000 (22:42 +0000)]
am
9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '
9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
Don't show disabled apps in ignore optimizations
Guang Zhu [Thu, 23 Jul 2015 22:41:48 +0000 (22:41 +0000)]
am
c1bef743: Prevent monkey from changing adoptable storage settings
* commit '
c1bef7430e1c49b9c3b2312328d3600261109ee8':
Prevent monkey from changing adoptable storage settings
Svetoslav Ganov [Thu, 23 Jul 2015 21:47:10 +0000 (21:47 +0000)]
Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:23:57 +0000 (20:23 +0000)]
Merge "Fix battery detail issues with "Android OS"" into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:23:09 +0000 (20:23 +0000)]
Merge "Don't show disabled apps in ignore optimizations" into mnc-dev
Pavel Zhamaitsiak [Thu, 23 Jul 2015 18:27:36 +0000 (18:27 +0000)]
am
d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '
d9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
Add or remove WFC setting when Wireless settings activity is resumed
Jason Monk [Thu, 23 Jul 2015 18:27:32 +0000 (18:27 +0000)]
am
838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '
838c843217c76418e5f65b38f40e6b39760de1e4':
Remove tuner from development settings
Guang Zhu [Thu, 23 Jul 2015 17:47:40 +0000 (10:47 -0700)]
Prevent monkey from changing adoptable storage settings
Bug:
22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
Pavel Zhamaitsiak [Thu, 23 Jul 2015 16:54:55 +0000 (16:54 +0000)]
Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
Svet Ganov [Thu, 23 Jul 2015 16:40:13 +0000 (09:40 -0700)]
Reset permissions and app links when clearing app preferences - settings
bug:
22359132
Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
Pavel Zhamaitsiak [Thu, 23 Jul 2015 16:31:58 +0000 (09:31 -0700)]
Add or remove WFC setting when Wireless settings activity is resumed
WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.
Bug:
22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458
Maurice Lam [Wed, 22 Jul 2015 20:17:37 +0000 (20:17 +0000)]
am
32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '
32b96646eec917987fdd38208c6b11a9bc8832d3':
[ScreenLock] Style encryption interstitial in SUW
Maurice Lam [Wed, 22 Jul 2015 20:17:34 +0000 (20:17 +0000)]
am
3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '
3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
[Fingerprint] Send RESULT_CANCELED when back from Add another
Maurice Lam [Wed, 22 Jul 2015 20:17:33 +0000 (20:17 +0000)]
am
e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '
e44ceed122aa06482bf03d58eba91536a29e4158':
[ScreenLock] Update illustration during setup wizard
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge "Remove tuner from development settings" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 14:12:05 +0000 (10:12 -0400)]
Fix battery detail issues with "Android OS"
Bug:
22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
Maurice Lam [Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)]
Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:39:35 +0000 (23:39 +0000)]
Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:38:34 +0000 (23:38 +0000)]
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
Maurice Lam [Fri, 17 Jul 2015 20:16:40 +0000 (13:16 -0700)]
[Fingerprint] Send RESULT_CANCELED when back from Add another
Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.
This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
FingerprintEnrollFinish. If the user clicks back in
FingerprintEnrollEnrolling, they will always go back to the
previous screen with RESULT_CANCELED, which would either be
FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
possible outside of Setup Wizard, they will be back in Find Sensor,
and pressing next will enroll an additional fingerprint.
- Edge case: if the user enrolled the maximum number of
fingerprints, and presses back, they will be bounced all the way
back to Settings > Security.
Bug:
22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d
Billy Lau [Tue, 21 Jul 2015 17:54:01 +0000 (17:54 +0000)]
am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
d06ba151f5cc966bf05b2ac0146602d31ae81c4a':
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 17:37:05 +0000 (17:37 +0000)]
Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
Amit Mahajan [Tue, 21 Jul 2015 17:11:00 +0000 (17:11 +0000)]
am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
Fix bug to force to close once change Bearer on APN
Amit Mahajan [Tue, 21 Jul 2015 16:57:12 +0000 (16:57 +0000)]
Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
Billy Lau [Tue, 21 Jul 2015 15:43:17 +0000 (16:43 +0100)]
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Overall, fixed the detection of the state of permission in the corresponding
UX to be more accurate. Also ensured that apps needing this capability can
launch the summary UX through a specific intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings.xml:
Increased the CHAR limits for some strings due to requests from translators.
Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
Julia Reynolds [Tue, 21 Jul 2015 15:30:45 +0000 (15:30 +0000)]
am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
f516e7dde0074416dbf51650cbfb9cc763027b27':
Make 'fingerprint' searchable in Settings.
Julia Reynolds [Thu, 16 Jul 2015 19:33:22 +0000 (15:33 -0400)]
Make 'fingerprint' searchable in Settings.
Bug:
22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
Jason Monk [Tue, 21 Jul 2015 13:30:18 +0000 (09:30 -0400)]
Don't show disabled apps in ignore optimizations
Bug:
22612760
Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d
Maurice Lam [Mon, 20 Jul 2015 23:08:38 +0000 (16:08 -0700)]
[ScreenLock] Style encryption interstitial in SUW
When running in setup wizard, style the encryption interstitial using
styles from Setup Wizard library, to be consistent with the rest of
the setup flow.
Bug:
22587892
Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
Maurice Lam [Tue, 21 Jul 2015 00:50:32 +0000 (00:50 +0000)]
am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
d85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
[ScreenLock] Change title of encryption interstitial
Maurice Lam [Tue, 21 Jul 2015 00:38:38 +0000 (00:38 +0000)]
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:33:14 +0000 (00:33 +0000)]
am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
d10026cbfde671448b702fde345da52ac7569d04':
[Fingerprint] Change message in encryption
Maurice Lam [Tue, 21 Jul 2015 00:33:13 +0000 (00:33 +0000)]
am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
[ScreenLock] Change title for RedactionInterstitial
Maurice Lam [Tue, 21 Jul 2015 00:22:34 +0000 (00:22 +0000)]
Merge "[Fingerprint] Change message in encryption" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:22:02 +0000 (00:22 +0000)]
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
Sungmin Choi [Mon, 20 Jul 2015 21:08:12 +0000 (14:08 -0700)]
Fix bug to force to close once change Bearer on APN
Bug:
22544257
Change-Id: I43eea4034c3d106b8e3f8e4f999f389db04b7567
Maurice Lam [Mon, 20 Jul 2015 22:35:21 +0000 (15:35 -0700)]
[ScreenLock] Change title for RedactionInterstitial
Change the title for RedactionInterstital to "Notifications".
Bug:
22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
Maurice Lam [Mon, 20 Jul 2015 23:39:39 +0000 (16:39 -0700)]
[ScreenLock] Update illustration during setup wizard
Update the illustration to a new version which changes the "screen"
illustrated in the device.
Bug:
22587892
Change-Id: Ic52e28eb40b965b49fa4f2f220284cd2768470d5
Jim Miller [Mon, 20 Jul 2015 23:05:05 +0000 (23:05 +0000)]
am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
3977df037c1cdd1bef92e3f4195c6e7b847a1c28':
Don't launch ConfirmDeviceCredentials multiple times.
Geoff Mendal [Mon, 20 Jul 2015 22:55:16 +0000 (22:55 +0000)]
am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
1992d5a1fc616f5132315ee6d4659c20728acad6':
Import translations. DO NOT MERGE
Jim Miller [Mon, 20 Jul 2015 22:50:29 +0000 (22:50 +0000)]
Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev
Jim Miller [Mon, 20 Jul 2015 22:36:21 +0000 (15:36 -0700)]
Don't launch ConfirmDeviceCredentials multiple times.
Fixes bug
18724944
Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
Geoff Mendal [Mon, 20 Jul 2015 22:33:59 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a4e18120641388458b5f90a531978292f307bc6
Auto-generated-cl: translation import
Maurice Lam [Mon, 20 Jul 2015 22:03:37 +0000 (15:03 -0700)]
[ScreenLock] Change title of encryption interstitial
Change the title of EncryptionInterstitial to "Secure start-up".
Bug:
22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
Maurice Lam [Mon, 20 Jul 2015 21:49:29 +0000 (14:49 -0700)]
[Fingerprint] Change message in encryption
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.
Bug:
22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
Makoto Onuki [Mon, 20 Jul 2015 20:45:36 +0000 (20:45 +0000)]
am
4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '
4dd637a07e7eba9341d85c21fbb1fccac7e685c3':
Fix ugly text wrapping on non-english locales
Jason Monk [Mon, 20 Jul 2015 20:45:33 +0000 (20:45 +0000)]
am
178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '
178c40998df2d5196bc5913fca831880cfa47c50':
Handle monkey crash
Makoto Onuki [Mon, 20 Jul 2015 20:35:07 +0000 (20:35 +0000)]
Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:32:28 +0000 (20:32 +0000)]
Merge "Handle monkey crash" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 17:40:40 +0000 (13:40 -0400)]
Handle monkey crash
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.
Bug:
22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
Christopher Tate [Mon, 20 Jul 2015 17:25:17 +0000 (17:25 +0000)]
am
b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit '
b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
Offer 'ask' as an available app-linking state
Christopher Tate [Mon, 20 Jul 2015 17:06:26 +0000 (17:06 +0000)]
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
Christopher Tate [Fri, 17 Jul 2015 20:15:12 +0000 (13:15 -0700)]
Offer 'ask' as an available app-linking state
Bug
22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
Jim Miller [Fri, 17 Jul 2015 21:15:56 +0000 (21:15 +0000)]
am
bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev
* commit '
bf9a425d5c3f61f02133084d11ab8481b0f53102':
Simplify FingerprintSettings
Jim Miller [Fri, 17 Jul 2015 21:05:06 +0000 (21:05 +0000)]
Merge "Simplify FingerprintSettings" into mnc-dev
Jim Miller [Fri, 17 Jul 2015 00:20:17 +0000 (17:20 -0700)]
Simplify FingerprintSettings
There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.
Fixes bug
22438498
Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
Julia Reynolds [Fri, 17 Jul 2015 20:25:56 +0000 (20:25 +0000)]
am
0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '
0c03b50a02007499208603733e597f72aa9a59c2':
Remove blank switchtext from switch preferences.
Julia Reynolds [Fri, 17 Jul 2015 20:11:25 +0000 (20:11 +0000)]
Merge "Remove blank switchtext from switch preferences." into mnc-dev
Billy Lau [Fri, 17 Jul 2015 18:39:18 +0000 (18:39 +0000)]
am
90a8a01b: Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '
90a8a01b629694d28dd7e40a8f0253894fc14e02':
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Billy Lau [Fri, 17 Jul 2015 18:28:27 +0000 (18:28 +0000)]
Merge "Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
Billy Lau [Thu, 16 Jul 2015 02:50:47 +0000 (03:50 +0100)]
Bug
21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.
Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
Christopher Tate [Thu, 16 Jul 2015 23:49:07 +0000 (23:49 +0000)]
am
ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
* commit '
ddaa142a094a404d7c5e6d7eea93920f8ed16696':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Thu, 16 Jul 2015 23:00:49 +0000 (16:00 -0700)]
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Bug
22504009
Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
Makoto Onuki [Thu, 16 Jul 2015 22:43:47 +0000 (15:43 -0700)]
Fix ugly text wrapping on non-english locales
Bug
22284618
Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
Jason Monk [Thu, 16 Jul 2015 20:41:15 +0000 (16:41 -0400)]
Remove tuner from development settings
It has a new home now.
Bug:
22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
Julia Reynolds [Wed, 15 Jul 2015 15:08:11 +0000 (11:08 -0400)]
Remove blank switchtext from switch preferences.
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug:
22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
Kenny Guy [Thu, 16 Jul 2015 13:01:44 +0000 (13:01 +0000)]
am
705faddb: Merge "Show disabled trust agents as off." into mnc-dev
* commit '
705faddbb37bbaa8dc7a18ab3290c02b5b6a2a2c':
Show disabled trust agents as off.
Kenny Guy [Thu, 16 Jul 2015 12:42:39 +0000 (12:42 +0000)]
Merge "Show disabled trust agents as off." into mnc-dev
Sanket Padawe [Thu, 16 Jul 2015 05:13:53 +0000 (05:13 +0000)]
am
046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '
046decca29376aba5b97b78900bfd867ca3f310c':
Use common xml file for multi-tab settings.
Sanket Padawe [Thu, 16 Jul 2015 05:01:06 +0000 (05:01 +0000)]
Merge "Use common xml file for multi-tab settings." into mnc-dev
Maurice Lam [Thu, 16 Jul 2015 02:27:58 +0000 (02:27 +0000)]
am
bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '
bec1d295586b752f81f523c8339dcd49c586d722':
[Fingerprint] Use accent color for fingerprint highlight
Maurice Lam [Thu, 16 Jul 2015 02:19:18 +0000 (02:19 +0000)]
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 23:01:53 +0000 (23:01 +0000)]
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
Jason Monk [Wed, 15 Jul 2015 23:01:51 +0000 (23:01 +0000)]
am
4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '
4a6b909559d50e02833afd5119876df070dfd458':
Change move storage from dropdown pref to dialog
Jason Monk [Wed, 15 Jul 2015 22:48:12 +0000 (22:48 +0000)]
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 22:48:05 +0000 (22:48 +0000)]
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 17:04:59 +0000 (13:04 -0400)]
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
Maurice Lam [Wed, 15 Jul 2015 19:38:05 +0000 (19:38 +0000)]
am
4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '
4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
[Fingerprint] Add fingerprint enroll in setup wizard
Jim Miller [Wed, 15 Jul 2015 19:30:55 +0000 (19:30 +0000)]
am
6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '
6b9d788914a600917e8edd4ecd502d6ccf87ca12':
Fixed the layout for the fingerprint renaming
Maurice Lam [Wed, 15 Jul 2015 19:28:05 +0000 (19:28 +0000)]
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 19:22:38 +0000 (15:22 -0400)]
Disable ignore battery optimization items that can't change
Bug:
22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
Jim Miller [Wed, 15 Jul 2015 19:18:05 +0000 (19:18 +0000)]
Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
Maurice Lam [Wed, 15 Jul 2015 18:55:57 +0000 (18:55 +0000)]
am
f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
* commit '
f90628c6ec8cf80b44b9559db448eb9537b41fdc':
[Fingerprint] Export FingerprintEnrollIntroduction
Maurice Lam [Wed, 15 Jul 2015 18:45:33 +0000 (18:45 +0000)]
Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev
Maurice Lam [Thu, 9 Jul 2015 23:38:37 +0000 (16:38 -0700)]
[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
Maurice Lam [Wed, 8 Jul 2015 23:59:59 +0000 (16:59 -0700)]
[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
052297172e33ec906a5da10a953be811ff60731c)
Selim Cinek [Wed, 8 Jul 2015 21:09:10 +0000 (14:09 -0700)]
Fixed the layout for the fingerprint renaming
Bug:
21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit
abd67de1ad3f265f217491b0e8b21819cfdcdcbe)
Kenny Guy [Wed, 15 Jul 2015 14:54:38 +0000 (15:54 +0100)]
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
Jason Monk [Wed, 15 Jul 2015 15:07:21 +0000 (15:07 +0000)]
am
cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '
cd075edf6dcff9ca9ff243760e032190acbdecdc':
Fix Help menu for PrivateVolumeSettings
Jason Monk [Wed, 15 Jul 2015 14:54:02 +0000 (14:54 +0000)]
Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 14:07:29 +0000 (14:07 +0000)]
am
f3907176: (-s ours) Import translations. DO NOT MERGE
* commit '
f3907176da3f17397f61bf48ba90ab08a9cd85f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:56:45 +0000 (06:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
Narayan Kamath [Tue, 14 Jul 2015 22:52:58 +0000 (22:52 +0000)]
am
83a25842: Merge "Lose some deprecated test annotations."
* commit '
83a25842e720ddb838519e194679b464d0114301':
Lose some deprecated test annotations.
xinhe [Tue, 14 Jul 2015 22:40:35 +0000 (22:40 +0000)]
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
xinhe [Tue, 14 Jul 2015 22:29:17 +0000 (22:29 +0000)]
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
xinhe [Mon, 13 Jul 2015 22:26:45 +0000 (15:26 -0700)]
Need to disable 5GHz bands for WiFi tethering in Japan
b/
22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
OSDN Git Service
