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

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

Svetoslav Ganov [Fri, 24 Jul 2015 03:10:41 +0000 (03:10 +0000)]

am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

* commit '6c2d4d73464e6026f42a615c75e3c5d7e3679d7b':
Reset permissions and app links when clearing app preferences - settings

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:10:07 +0000 (03:10 +0000)]

am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
Fix battery detail issues with "Android OS"

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:10:05 +0000 (03:10 +0000)]

am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev

* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
Don't show disabled apps in ignore optimizations

commit | commitdiff | tree

Guang Zhu [Fri, 24 Jul 2015 03:03:26 +0000 (03:03 +0000)]

am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

* commit '402c866c3117571ddb66614fdbf963e8564a3232':
Prevent monkey from changing adoptable storage settings

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 24 Jul 2015 03:03:24 +0000 (03:03 +0000)]

am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

* commit 'bdc3fc3672df250ea3fd3c8a3b73048ebc232ad4':
Add or remove WFC setting when Wireless settings activity is resumed

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:03:23 +0000 (03:03 +0000)]

am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev

* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
Remove tuner from development settings

commit | commitdiff | tree

Svetoslav Ganov [Thu, 23 Jul 2015 21:56:56 +0000 (21:56 +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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:32:34 +0000 (20:32 +0000)]

am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
Fix battery detail issues with "Android OS"

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:32:32 +0000 (20:32 +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

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:23:57 +0000 (20:23 +0000)]

Merge "Fix battery detail issues with "Android OS"" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Guang Zhu [Thu, 23 Jul 2015 19:32:40 +0000 (19:32 +0000)]

am c1bef743: Prevent monkey from changing adoptable storage settings

* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
Prevent monkey from changing adoptable storage settings

commit | commitdiff | tree

Maurice Lam [Thu, 23 Jul 2015 19:18:51 +0000 (19:18 +0000)]

am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev

* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
[ScreenLock] Style encryption interstitial in SUW

commit | commitdiff | tree

Maurice Lam [Thu, 23 Jul 2015 19:18:50 +0000 (19:18 +0000)]

am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev

* commit 'f1fbf9cca44d8a16bc1af92964558cf91ac00161':
[Fingerprint] Send RESULT_CANCELED when back from Add another

commit | commitdiff | tree

Maurice Lam [Thu, 23 Jul 2015 19:18:48 +0000 (19:18 +0000)]

am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

* commit 'ad904de84644ab72754fe7d0cc5a34d1928c03f1':
[ScreenLock] Update illustration during setup wizard

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 23 Jul 2015 19:13:06 +0000 (19:13 +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

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 19:13:05 +0000 (19:13 +0000)]

am 838c8432: Merge "Remove tuner from development settings" into mnc-dev

* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
Remove tuner from development settings

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Wed, 22 Jul 2015 20:23:18 +0000 (20:23 +0000)]

am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev

* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
[ScreenLock] Style encryption interstitial in SUW

commit | commitdiff | tree

Maurice Lam [Wed, 22 Jul 2015 20:23:17 +0000 (20:23 +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

commit | commitdiff | tree

Maurice Lam [Wed, 22 Jul 2015 20:23:15 +0000 (20:23 +0000)]

am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
[ScreenLock] Update illustration during setup wizard

commit | commitdiff | tree

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

Merge "Remove tuner from development settings" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 22 Jul 2015 14:10:23 +0000 (14:10 +0000)]

am 0a167c40: (-s ours) Import translations. DO NOT MERGE

* commit '0a167c400af710fe97d7491abdffbe54bec42761':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 22 Jul 2015 13:59:04 +0000 (06:59 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Maurice Lam [Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)]

Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Tue, 21 Jul 2015 23:38:34 +0000 (23:38 +0000)]

Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Billy Lau [Tue, 21 Jul 2015 18:06:42 +0000 (18:06 +0000)]

am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev

* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...

commit | commitdiff | tree

Billy Lau [Tue, 21 Jul 2015 17:54:00 +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)...

commit | commitdiff | tree

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

commit | commitdiff | tree

Amit Mahajan [Tue, 21 Jul 2015 17:17:45 +0000 (17:17 +0000)]

am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev

* commit '480692fab398a080be6648ddf424b3129f2c6cbc':
Fix bug to force to close once change Bearer on APN

commit | commitdiff | tree

Amit Mahajan [Tue, 21 Jul 2015 17:09:12 +0000 (17:09 +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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Tue, 21 Jul 2015 15:44:21 +0000 (15:44 +0000)]

am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.

* commit 'd409b70093211df215bc117ccf9ba8d0924e983f':
Make 'fingerprint' searchable in Settings.

commit | commitdiff | tree

Julia Reynolds [Tue, 21 Jul 2015 15:31:17 +0000 (15:31 +0000)]

am f516e7dd: Make \'fingerprint\' searchable in Settings.

* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
Make 'fingerprint' searchable in Settings.

commit | commitdiff | tree

Julia Reynolds [Thu, 16 Jul 2015 19:33:22 +0000 (15:33 -0400)]

Make 'fingerprint' searchable in Settings.

Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

* commit 'd5af0d8b8a973a2f82024f5358572b609e47a758':
[ScreenLock] Change title of encryption interstitial

commit | commitdiff | tree

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

am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev

* commit '6132fe1c02a944bf87604a4773e091124de4954d':
[Fingerprint] Change message in encryption

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:49:46 +0000 (00:49 +0000)]

am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
[ScreenLock] Change title of encryption interstitial

commit | commitdiff | tree

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

Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

commit | commitdiff | tree

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

am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev

* commit 'd10026cbfde671448b702fde345da52ac7569d04':
[Fingerprint] Change message in encryption

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:34 +0000 (00:22 +0000)]

Merge "[Fingerprint] Change message in encryption" into mnc-dev

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

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

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

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

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

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

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

commit | commitdiff | tree

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

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: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 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: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: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 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: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

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

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: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.

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help