git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Maurice Lam [Tue, 21 Jul 2015 01:04:49 +0000 (01:04 +0000)]

am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

* commit '135c8869fe4cc2cad8df07172c2f225da23ef07e':
[ScreenLock] Change title for RedactionInterstitial

commit | commitdiff | tree

Maurice Lam [Tue, 21 Jul 2015 00:49:49 +0000 (00:49 +0000)]

am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

* commit '8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
[ScreenLock] Change title for RedactionInterstitial

commit | commitdiff | tree

Maurice Lam [Tue, 21 Jul 2015 00:33:22 +0000 (00:33 +0000)]

am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
[ScreenLock] Change title for RedactionInterstitial

commit | commitdiff | tree

Maurice Lam [Tue, 21 Jul 2015 00:22:02 +0000 (00:22 +0000)]

Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jim Miller [Mon, 20 Jul 2015 23:28:14 +0000 (23:28 +0000)]

am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev

* commit 'a8f8879895edd86fd206fc1a8d2d684e09fcc57f':
Don't launch ConfirmDeviceCredentials multiple times.

commit | commitdiff | tree

Jim Miller [Mon, 20 Jul 2015 23:20:15 +0000 (23:20 +0000)]

am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev

* commit 'd74a36031cbe87a8a18f4ffc99aaa399245f181c':
Don't launch ConfirmDeviceCredentials multiple times.

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 23:06:47 +0000 (23:06 +0000)]

am e4af992f: (-s ours) am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE

* commit 'e4af992fef82ab26670db5adc7957b4385baa86c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 23:06:46 +0000 (23:06 +0000)]

am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE

* commit 'a6e9efbeb3bd83db0ad5d45a2bafb306935e02dd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jim Miller [Mon, 20 Jul 2015 23:05:51 +0000 (23:05 +0000)]

am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev

* commit '3977df037c1cdd1bef92e3f4195c6e7b847a1c28':
Don't launch ConfirmDeviceCredentials multiple times.

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 22:57:40 +0000 (22:57 +0000)]

am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE

* commit 'a74f78b188d11b0dfd7651aff77b2db4eae0278e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 22:57:38 +0000 (22:57 +0000)]

am 4a0662dd: (-s ours) Import translations. DO NOT MERGE

* commit '4a0662dddeeea4fa9a62a97b5dd9e996860db7cd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 22:52:48 +0000 (22:52 +0000)]

am 1992d5a1: (-s ours) Import translations. DO NOT MERGE

* commit '1992d5a1fc616f5132315ee6d4659c20728acad6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jim Miller [Mon, 20 Jul 2015 22:50:29 +0000 (22:50 +0000)]

Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 22:41:29 +0000 (15:41 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ief6e249d326487904a789fa2b33e6d775b7b2bd7
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Mon, 20 Jul 2015 21:23:38 +0000 (21:23 +0000)]

am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev

* commit 'f9b46965b7c3e2fb7985669f3a2b1bdeed06a2c3':
Fix ugly text wrapping on non-english locales

commit | commitdiff | tree

Jason Monk [Mon, 20 Jul 2015 21:23:37 +0000 (21:23 +0000)]

am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev

* commit 'b48e56c9b232710c2de0fa852d7230e9b0a191d7':
Handle monkey crash

commit | commitdiff | tree

Makoto Onuki [Mon, 20 Jul 2015 21:08:05 +0000 (21:08 +0000)]

am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev

* commit '75842ffc9a8a41425b69e1e1ad77ffde14ed4749':
Fix ugly text wrapping on non-english locales

commit | commitdiff | tree

Jason Monk [Mon, 20 Jul 2015 21:08:04 +0000 (21:08 +0000)]

am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev

* commit '959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
Handle monkey crash

commit | commitdiff | tree

Makoto Onuki [Mon, 20 Jul 2015 20:46:02 +0000 (20:46 +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

commit | commitdiff | tree

Jason Monk [Mon, 20 Jul 2015 20:46:01 +0000 (20:46 +0000)]

am 178c4099: Merge "Handle monkey crash" into mnc-dev

* commit '178c40998df2d5196bc5913fca831880cfa47c50':
Handle monkey crash

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Mon, 20 Jul 2015 20:32:28 +0000 (20:32 +0000)]

Merge "Handle monkey crash" into mnc-dev

commit | commitdiff | tree

Christopher Tate [Mon, 20 Jul 2015 17:59:35 +0000 (17:59 +0000)]

am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev

* commit '7cce6d0c529bf9d3820b1fc4d8b5ad364a74a478':
Offer 'ask' as an available app-linking state

commit | commitdiff | tree

Christopher Tate [Mon, 20 Jul 2015 17:41:08 +0000 (17:41 +0000)]

am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev

* commit 'f330857a17d29cec33ca0169cb30fdc69854ab52':
Offer 'ask' as an available app-linking state

commit | commitdiff | tree

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

commit | commitdiff | tree

Christopher Tate [Mon, 20 Jul 2015 17:24:02 +0000 (17:24 +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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 15:00:21 +0000 (15:00 +0000)]

am e9c77337: (-s ours) am 9c314f05: (-s ours) Import translations. DO NOT MERGE

* commit 'e9c773371d45640868978cc7722295c228b9089e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 14:45:23 +0000 (14:45 +0000)]

am 9c314f05: (-s ours) Import translations. DO NOT MERGE

* commit '9c314f05f85ffe6918bcd9d0747903dc6786dfc0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Jul 2015 14:01:44 +0000 (07:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ibd37f1c6a32c600eaf7b410891ba81814589ea04
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

Jim Miller [Fri, 17 Jul 2015 21:42:07 +0000 (21:42 +0000)]

am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev

* commit '64117fef33b0e73690a6cddf38992ea5b82d10db':
Simplify FingerprintSettings

commit | commitdiff | tree

Jim Miller [Fri, 17 Jul 2015 21:30:11 +0000 (21:30 +0000)]

am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev

* commit '4b3bc882ad2824a1f7d4362d8757ddb9c7ba21ce':
Simplify FingerprintSettings

commit | commitdiff | tree

Jim Miller [Fri, 17 Jul 2015 21:15:57 +0000 (21:15 +0000)]

am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev

* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
Simplify FingerprintSettings

commit | commitdiff | tree

Jim Miller [Fri, 17 Jul 2015 21:05:06 +0000 (21:05 +0000)]

Merge "Simplify FingerprintSettings" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Fri, 17 Jul 2015 20:53:54 +0000 (20:53 +0000)]

am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev

* commit '03b1b4f33f9101d95f0e881ffebec24a99498eb0':
Remove blank switchtext from switch preferences.

commit | commitdiff | tree

Julia Reynolds [Fri, 17 Jul 2015 20:40:19 +0000 (20:40 +0000)]

am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev

* commit '8560ae2f8752f611ffee651289519a7993b3e500':
Remove blank switchtext from switch preferences.

commit | commitdiff | tree

Julia Reynolds [Fri, 17 Jul 2015 20:27:24 +0000 (20:27 +0000)]

am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev

* commit '0c03b50a02007499208603733e597f72aa9a59c2':
Remove blank switchtext from switch preferences.

commit | commitdiff | tree

Julia Reynolds [Fri, 17 Jul 2015 20:11:25 +0000 (20:11 +0000)]

Merge "Remove blank switchtext from switch preferences." into mnc-dev

commit | commitdiff | tree

Billy Lau [Fri, 17 Jul 2015 19:09:06 +0000 (19:09 +0000)]

am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev

* commit 'e5a95396da082a3ba432c5d8ed5a7baa2eacd55c':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...

commit | commitdiff | tree

Billy Lau [Fri, 17 Jul 2015 18:57:51 +0000 (18:57 +0000)]

am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev

* commit 'e104fced18056905286ee01a3ef8c3d12f2b9e4d':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...

commit | commitdiff | tree

Billy Lau [Fri, 17 Jul 2015 18:39:23 +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)...

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Christopher Tate [Fri, 17 Jul 2015 00:17:06 +0000 (00:17 +0000)]

am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

* commit 'b42eb5e221b9120741f497cc94486dc804ab2cbb':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

commit | commitdiff | tree

Christopher Tate [Fri, 17 Jul 2015 00:04:04 +0000 (00:04 +0000)]

am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

* commit '649cc87f994c0010e8fd7567b7cece77ffffb0fd':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

commit | commitdiff | tree

Christopher Tate [Thu, 16 Jul 2015 23:50:06 +0000 (23:50 +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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kenny Guy [Thu, 16 Jul 2015 13:30:00 +0000 (13:30 +0000)]

am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev

* commit '00a82a4e1b125a25ec3c92e90dbc3de986124813':
Show disabled trust agents as off.

commit | commitdiff | tree

Kenny Guy [Thu, 16 Jul 2015 13:15:57 +0000 (13:15 +0000)]

am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev

* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
Show disabled trust agents as off.

commit | commitdiff | tree

Kenny Guy [Thu, 16 Jul 2015 13:02:44 +0000 (13:02 +0000)]

am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev

* commit '705faddbb37bbaa8dc7a18ab3290c02b5b6a2a2c':
Show disabled trust agents as off.

commit | commitdiff | tree

Kenny Guy [Thu, 16 Jul 2015 12:42:39 +0000 (12:42 +0000)]

Merge "Show disabled trust agents as off." into mnc-dev

commit | commitdiff | tree

Sanket Padawe [Thu, 16 Jul 2015 05:40:25 +0000 (05:40 +0000)]

am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev

* commit '18c31082b397858564f1dc99a785dc77d1814151':
Use common xml file for multi-tab settings.

commit | commitdiff | tree

Sanket Padawe [Thu, 16 Jul 2015 05:27:44 +0000 (05:27 +0000)]

am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev

* commit 'c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
Use common xml file for multi-tab settings.

commit | commitdiff | tree

Sanket Padawe [Thu, 16 Jul 2015 05:14:09 +0000 (05:14 +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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Thu, 16 Jul 2015 02:57:00 +0000 (02:57 +0000)]

am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev

* commit '85f199d8620c689ae6f0ae94eeda9168fa93c2db':
[Fingerprint] Use accent color for fingerprint highlight

commit | commitdiff | tree

Maurice Lam [Thu, 16 Jul 2015 02:43:11 +0000 (02:43 +0000)]

am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev

* commit '021b3d955f91eeaa03f8f45401663954560dc748':
[Fingerprint] Use accent color for fingerprint highlight

commit | commitdiff | tree

Maurice Lam [Thu, 16 Jul 2015 02:28:09 +0000 (02:28 +0000)]

am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev

* commit 'bec1d295586b752f81f523c8339dcd49c586d722':
[Fingerprint] Use accent color for fingerprint highlight

commit | commitdiff | tree

Maurice Lam [Thu, 16 Jul 2015 02:19:18 +0000 (02:19 +0000)]

Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 23:30:21 +0000 (23:30 +0000)]

am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev

* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
Disable ignore battery optimization items that can't change

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 23:30:19 +0000 (23:30 +0000)]

am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev

* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
Change move storage from dropdown pref to dialog

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 23:20:43 +0000 (23:20 +0000)]

am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev

* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
Disable ignore battery optimization items that can't change

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 23:20:41 +0000 (23:20 +0000)]

am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev

* commit '7beb763da239fb71f214cab0587ae52f383985fc':
Change move storage from dropdown pref to dialog

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 23:03:58 +0000 (23:03 +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

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 23:03:57 +0000 (23:03 +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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 22:47:19 +0000 (22:47 +0000)]

am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev

* commit '2ea2950d9c15e2da38d5aece8de7c0079539d99a':
[Fingerprint] Add fingerprint enroll in setup wizard

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 22:47:18 +0000 (22:47 +0000)]

am 593fe777: am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

* commit '593fe7778cde419f73d3ec331d028bd86a4f442b':
Fixed the layout for the fingerprint renaming

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 22:47:17 +0000 (22:47 +0000)]

am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev

* commit '649215a50c65b512b51cd21b54e479cd4ff3b926':
[Fingerprint] Export FingerprintEnrollIntroduction

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 22:32:46 +0000 (22:32 +0000)]

am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev

* commit '77352c65be3d4106da93609794610d88347e069b':
[Fingerprint] Add fingerprint enroll in setup wizard

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 22:32:45 +0000 (22:32 +0000)]

am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

* commit '22e51c8b4f6622cc160d8652b8abe9db304b9a5a':
Fixed the layout for the fingerprint renaming

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 22:32:43 +0000 (22:32 +0000)]

am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev

* commit 'e63322f640cf955ba296e064b07e4920d334f851':
[Fingerprint] Export FingerprintEnrollIntroduction

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 22:26:51 +0000 (22:26 +0000)]

am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev

* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
[Fingerprint] Add fingerprint enroll in setup wizard

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 22:26:50 +0000 (22:26 +0000)]

am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
Fixed the layout for the fingerprint renaming

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 21:57:06 +0000 (14:57 -0700)]

resolved conflicts for merge of f90628c6 to mnc-dr-dev

Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 19:28:05 +0000 (19:28 +0000)]

Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jim Miller [Wed, 15 Jul 2015 19:18:05 +0000 (19:18 +0000)]

Merge "Fixed the layout for the fingerprint renaming" into mnc-dev

commit | commitdiff | tree

Maurice Lam [Wed, 15 Jul 2015 18:45:33 +0000 (18:45 +0000)]

Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 15:36:15 +0000 (15:36 +0000)]

am eb37daff: am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev

* commit 'eb37daffa1291056d4ff99e94ea96e05a1e8f7b1':
Fix Help menu for PrivateVolumeSettings

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 15:22:19 +0000 (15:22 +0000)]

am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev

* commit 'b6cb215cbefc803b0a1510a7f7c606d4d5c10045':
Fix Help menu for PrivateVolumeSettings

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 15:08:44 +0000 (15:08 +0000)]

am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev

* commit 'cd075edf6dcff9ca9ff243760e032190acbdecdc':
Fix Help menu for PrivateVolumeSettings

commit | commitdiff | tree

Jason Monk [Wed, 15 Jul 2015 14:54:02 +0000 (14:54 +0000)]

Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 14:47:29 +0000 (14:47 +0000)]

am 13b52d78: (-s ours) am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '13b52d781a3d7c7b2cb9dbd12ba5ca4650f634e2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 14:35:26 +0000 (14:35 +0000)]

am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '78aeabe834c6efacbbb7712bdbdd100917e356f3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 14:33:07 +0000 (14:33 +0000)]

am 32a9a993: (-s ours) am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE

* commit '32a9a993f74c962858591b0d2293edddb37d1b43':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 15 Jul 2015 14:16:17 +0000 (14:16 +0000)]

am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE

* commit '4c60755b310dfb54a1eb748fe184f6e928295b3d':
Import translations. DO NOT MERGE

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help