OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:54:06 +0000 (20:54 +0000)]
am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
  Hide usage graph on app usage details pages.

9 years agoMerge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Hide usage graph on app usage details pages." into mnc-dev

9 years agoam 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:01 +0000 (20:08 +0000)]
am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
  Make fingerprint error text a live region

9 years agoam 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:00 +0000 (20:08 +0000)]
am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
  Adjust enrollment UI for sw400 devices

9 years agoam 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:07:58 +0000 (20:07 +0000)]
am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
  Don't use screenshot if structure is disabled (2/2)

9 years agoMerge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]
Merge "Make fingerprint error text a live region" into mnc-dev

9 years agoMerge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

9 years agoMerge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:49:43 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev

9 years agoDon't use screenshot if structure is disabled (2/2)
Jorim Jaggi [Tue, 28 Jul 2015 00:48:02 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (2/2)

Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034

9 years agoHide usage graph on app usage details pages.
Julia Reynolds [Mon, 27 Jul 2015 20:00:06 +0000 (16:00 -0400)]
Hide usage graph on app usage details pages.

Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560

9 years agoMake fingerprint error text a live region
Jorim Jaggi [Tue, 28 Jul 2015 00:59:05 +0000 (17:59 -0700)]
Make fingerprint error text a live region

Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d

9 years agoam 730389bd: Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:50:45 +0000 (00:50 +0000)]
am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string

9 years agoam dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:50:44 +0000 (00:50 +0000)]
am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity

9 years agoMerge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]
Merge "Adjust choose assist app string" into mnc-dev

9 years agoMerge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]
Merge "Fix blank confirm device credential activity" into mnc-dev

9 years agoAdjust enrollment UI for sw400 devices
Jorim Jaggi [Tue, 28 Jul 2015 00:31:23 +0000 (17:31 -0700)]
Adjust enrollment UI for sw400 devices

Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b

9 years agoAdjust choose assist app string
Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]
Adjust choose assist app string

Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f

9 years agoam 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 21:11:31 +0000 (21:11 +0000)]
am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
  Autocapitalizing the fingerprint names now

9 years agoam a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 21:11:30 +0000 (21:11 +0000)]
am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
  Added content description for the fingerprint icon

9 years agoam 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 21:11:28 +0000 (21:11 +0000)]
am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit '95ddf903495f97f6d008f8723887228015ed7ead':
  Adapted a string in the fingerprint enrollment flow

9 years agoMerge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Autocapitalizing the fingerprint names now" into mnc-dev

9 years agoMerge "Added content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]
Merge "Added content description for the fingerprint icon" into mnc-dev

9 years agoMerge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:23 +0000 (20:57 +0000)]
Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

9 years agoam 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into...
Jorim Jaggi [Mon, 27 Jul 2015 19:18:34 +0000 (19:18 +0000)]
am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '58d1995c904f12dfb00185af3dabfe267d50568a':
  Move PIN/Pattern appear animation to RenderThread (2/2)

9 years agoMerge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 18:55:30 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

9 years agoFix blank confirm device credential activity
Jorim Jaggi [Fri, 24 Jul 2015 20:03:12 +0000 (13:03 -0700)]
Fix blank confirm device credential activity

Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.

Bug: 22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d

9 years agoam 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:51:45 +0000 (18:51 +0000)]
am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
  Battery summary - tint uid 0 icon

9 years agoMerge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]
Merge "Battery summary - tint uid 0 icon" into mnc-dev

9 years agoam 08cb3983: Merge "Update battery optimization strings" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:06:02 +0000 (18:06 +0000)]
am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
  Update battery optimization strings

9 years agoam ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences...
Sanket Padawe [Mon, 27 Jul 2015 18:06:01 +0000 (18:06 +0000)]
am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit 'ca258251521350421883a79f741ff872103e0ff4':
  Fix issues in AP dialog arising after clicking on AP preferences.

9 years agoam 9a1c0dce: Handle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 18:06:00 +0000 (18:06 +0000)]
am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '9a1c0dce7a496f51087cf0497b931a31c64b0a65':
  Handle app uninstall via Storage & USB.

9 years agoMerge "Update battery optimization strings" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 17:39:54 +0000 (17:39 +0000)]
Merge "Update battery optimization strings" into mnc-dev

9 years agoMerge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
Sanket Padawe [Mon, 27 Jul 2015 17:31:42 +0000 (17:31 +0000)]
Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

9 years agoBattery summary - tint uid 0 icon
Jason Monk [Mon, 27 Jul 2015 17:03:42 +0000 (13:03 -0400)]
Battery summary - tint uid 0 icon

Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b

9 years agoUpdate battery optimization strings
Jason Monk [Mon, 27 Jul 2015 15:23:15 +0000 (11:23 -0400)]
Update battery optimization strings

Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa

9 years agoHandle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 15:13:25 +0000 (11:13 -0400)]
Handle app uninstall via Storage & USB.

Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 13:53:25 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam e37e1232: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 00:59:51 +0000 (00:59 +0000)]
am e37e1232: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 38c9b9eb: Update FRP warning to spec
Adrian Roos [Sat, 25 Jul 2015 00:59:08 +0000 (00:59 +0000)]
am 38c9b9eb: Update FRP warning to spec

* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
  Update FRP warning to spec

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 00:09:25 +0000 (17:09 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 23:56:10 +0000 (16:56 -0700)]
Import translations. DO NOT MERGE

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

9 years agoAutocapitalizing the fingerprint names now
Selim Cinek [Fri, 24 Jul 2015 23:50:16 +0000 (16:50 -0700)]
Autocapitalizing the fingerprint names now

Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86

9 years agoAdded content description for the fingerprint icon
Selim Cinek [Thu, 23 Jul 2015 22:05:38 +0000 (15:05 -0700)]
Added content description for the fingerprint icon

Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804

9 years agoUpdate FRP warning to spec
Adrian Roos [Fri, 24 Jul 2015 18:30:14 +0000 (11:30 -0700)]
Update FRP warning to spec

Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227

9 years agoFix issues in AP dialog arising after clicking on AP preferences.
Sanket Padawe [Fri, 24 Jul 2015 20:52:03 +0000 (13:52 -0700)]
Fix issues in AP dialog arising after clicking on AP preferences.

+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7

9 years agoam 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
Maurice Lam [Fri, 24 Jul 2015 03:17:43 +0000 (03:17 +0000)]
am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
  [Fingerprint] Show skip button during SUW

9 years agoMerge "[Fingerprint] Show skip button during SUW" into mnc-dev
Maurice Lam [Fri, 24 Jul 2015 03:08:29 +0000 (03:08 +0000)]
Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

9 years agoam 5376d54e: (-s ours) Import translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 01:23:19 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport 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

9 years agoAdapted a string in the fingerprint enrollment flow
Selim Cinek [Thu, 23 Jul 2015 21:46:44 +0000 (14:46 -0700)]
Adapted a string in the fingerprint enrollment flow

Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376

9 years agoam cce844a7: Merge "Reset permissions and app links when clearing app preferences...
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

9 years agoMerge "Reset permissions and app links when clearing app preferences - 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

9 years agoam 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
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"

9 years agoam 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
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

9 years agoMerge "Fix battery detail issues with "Android OS"" 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

9 years agoMerge "Don't show disabled apps in ignore optimizations" 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

9 years agoam c1bef743: Prevent monkey from changing adoptable storage settings
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

9 years agoam d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is...
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

9 years agoam 838c8432: Merge "Remove tuner from development settings" into mnc-dev
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

9 years agoPrevent monkey from changing adoptable storage 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

9 years agoMerge "Add or remove WFC setting when Wireless settings activity is resumed" into...
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

9 years agoReset permissions and app links when clearing app preferences - settings
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

9 years agoAdd or remove WFC setting when Wireless settings activity is resumed
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

9 years ago[Fingerprint] Show skip button during SUW
Maurice Lam [Wed, 22 Jul 2015 23:03:32 +0000 (16:03 -0700)]
[Fingerprint] Show skip button during SUW

Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.

Bug: 22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1

9 years agoam 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
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

9 years agoam 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another...
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

9 years agoam e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
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

9 years agoMerge "Remove tuner from development settings" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge "Remove tuner from development settings" into mnc-dev

9 years agoFix battery detail issues with "Android OS"
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)]
Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev

9 years agoMerge "[Fingerprint] Send RESULT_CANCELED when back from Add another" 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

9 years agoMerge "[ScreenLock] Update illustration during setup wizard" 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

9 years agoMove PIN/Pattern appear animation to RenderThread (2/2)
Jorim Jaggi [Tue, 21 Jul 2015 22:34:26 +0000 (15:34 -0700)]
Move PIN/Pattern appear animation to RenderThread (2/2)

Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9

9 years ago[Fingerprint] Send RESULT_CANCELED when back from Add another
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

9 years agoam d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change...
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)...

9 years agoMerge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into...
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

9 years agoam e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
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

9 years agoMerge "Fix bug to force to close once change Bearer on APN" into mnc-dev
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

9 years agoBug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
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

9 years agoam f516e7dd: Make \'fingerprint\' searchable in Settings.
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.

9 years agoMake '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

9 years agoDon't show disabled apps in ignore optimizations
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

9 years ago[ScreenLock] Style encryption interstitial in SUW
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

9 years agoam d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
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

9 years agoMerge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:38:38 +0000 (00:38 +0000)]
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

9 years agoam d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
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

9 years agoam af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
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

9 years agoMerge "[Fingerprint] Change message in encryption" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:22:34 +0000 (00:22 +0000)]
Merge "[Fingerprint] Change message in encryption" into mnc-dev

9 years agoMerge "[ScreenLock] Change title for RedactionInterstitial" 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

9 years agoFix bug to force to close once change Bearer on APN
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

9 years ago[ScreenLock] Change title for RedactionInterstitial
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

9 years ago[ScreenLock] Update illustration during setup wizard
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

9 years agoam 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into...
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.

9 years agoam 1992d5a1: (-s ours) Import translations. DO NOT MERGE
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

9 years agoMerge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev
Jim Miller [Mon, 20 Jul 2015 22:50:29 +0000 (22:50 +0000)]
Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoDon't launch ConfirmDeviceCredentials multiple times.
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

9 years agoImport translations. DO NOT MERGE
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