Commit Graph

9063 Commits

Author SHA1 Message Date
Jorim Jaggi
dcf61a2dfa Merge "Fix blank confirm device credential activity" into mnc-dev 2015-07-28 00:36:00 +00:00
Jorim Jaggi
33f430ea90 am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '935b4444160ca816a769faf509a2d6789e5e6651':
  Move PIN/Pattern appear animation to RenderThread (2/2)
2015-07-27 19:30:29 +00:00
Jason Monk
436a8bbeb0 am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '3eb14e0383b15a379bd224cabdebe4e5d7366279':
  Battery summary - tint uid 0 icon
2015-07-27 19:04:10 +00:00
Jorim Jaggi
58d1995c90 Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev 2015-07-27 18:55:30 +00:00
Jorim Jaggi
35d26096c0 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
2015-07-27 18:53:29 +00:00
Jason Monk
3b521b60d3 Merge "Battery summary - tint uid 0 icon" into mnc-dev 2015-07-27 18:36:10 +00:00
Jason Monk
f0b615de01 am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
  Update battery optimization strings
2015-07-27 18:19:09 +00:00
Sanket Padawe
f9a6c5bb2f am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '970881d912f29775bb4063678c98fa77d3186b9b':
  Fix issues in AP dialog arising after clicking on AP preferences.
2015-07-27 18:19:07 +00:00
Julia Reynolds
82b938c4ae am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.
* commit '0c8bee9643717519c7d8ca7888068c7baf07b994':
  Handle app uninstall via Storage & USB.
2015-07-27 18:19:06 +00:00
Jason Monk
08cb39837f Merge "Update battery optimization strings" into mnc-dev 2015-07-27 17:39:54 +00:00
Sanket Padawe
ca25825152 Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev 2015-07-27 17:31:42 +00:00
Jason Monk
5ef0a9e826 Battery summary - tint uid 0 icon
Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b
2015-07-27 13:03:42 -04:00
Jason Monk
c9eba1f253 Update battery optimization strings
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
2015-07-27 12:29:25 -04:00
Julia Reynolds
9a1c0dce7a Handle app uninstall via Storage & USB.
Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2
2015-07-27 11:13:25 -04:00
Adrian Roos
b87428a61d am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec
2015-07-25 15:54:26 +00:00
Zach Johnson
356fce4606 Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
Once they are enabled for the first time, they'll show up indefinitely.

b/22667081

Change-Id: Ia28de99d7d638d54c15fac2e08edeb70a9657e23
2015-07-24 16:46:31 -07:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
2015-07-24 15:09:34 -07:00
Sanket Padawe
3bf0db8d10 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
2015-07-24 13:52:03 -07:00
Maurice Lam
11d1f6d3a1 am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
  [Fingerprint] Show skip button during SUW
2015-07-24 03:34:46 +00:00
Svetoslav Ganov
1fa5f4b336 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
2015-07-24 03:10:41 +00:00
Jason Monk
e9b9736415 am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
  Fix battery detail issues with "Android OS"
2015-07-24 03:10:07 +00:00
Jason Monk
9b6ff57eb5 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
2015-07-24 03:10:05 +00:00
Maurice Lam
36c7601409 Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 2015-07-24 03:08:29 +00:00
Guang Zhu
b91da24db7 am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
  Prevent monkey from changing adoptable storage settings
2015-07-24 03:03:26 +00:00
Pavel Zhamaitsiak
a20eaca1a6 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
2015-07-24 03:03:24 +00:00
Jason Monk
b46b993403 am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
  Remove tuner from development settings
2015-07-24 03:03:23 +00:00
Svetoslav Ganov
cce844a7a3 Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 2015-07-23 21:47:10 +00:00
Jason Monk
8bf5f3075e Merge "Fix battery detail issues with "Android OS"" into mnc-dev 2015-07-23 20:23:57 +00:00
Jason Monk
9927acd3ad Merge "Don't show disabled apps in ignore optimizations" into mnc-dev 2015-07-23 20:23:09 +00:00
Maurice Lam
7a33511397 am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-23 19:18:51 +00:00
Maurice Lam
705def9a22 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
2015-07-23 19:18:50 +00:00
Guang Zhu
c1bef7430e Prevent monkey from changing adoptable storage settings
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
2015-07-23 10:57:59 -07:00
Pavel Zhamaitsiak
d9e0ed1b3e Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 2015-07-23 16:54:55 +00:00
Svet Ganov
841bb3d336 Reset permissions and app links when clearing app preferences - settings
bug:22359132

Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
2015-07-23 09:40:16 -07:00
Pavel Zhamaitsiak
3e7e2c57d4 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
2015-07-23 09:31:58 -07:00
Maurice Lam
5f8d7dbe52 [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
2015-07-22 16:51:47 -07:00
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Jason Monk
82f30d2a41 Fix battery detail issues with "Android OS"
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
2015-07-22 10:12:05 -04:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
3c1f46dc2c Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 2015-07-21 23:39:35 +00:00
Jorim Jaggi
f5b17e5588 Move PIN/Pattern appear animation to RenderThread (2/2)
Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
2015-07-21 15:34:26 -07:00
Maurice Lam
da433902d4 [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
2015-07-21 15:23:11 -07:00
Billy Lau
bc3695c231 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)...
2015-07-21 18:06:42 +00:00
Billy Lau
d06ba151f5 Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 2015-07-21 17:37:08 +00:00
Amit Mahajan
c5459430a0 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
2015-07-21 17:17:45 +00:00
Amit Mahajan
e8357caad8 Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 2015-07-21 16:57:13 +00:00
Billy Lau
bb3aa2632a 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
2015-07-21 17:44:49 +01:00
Julia Reynolds
6712be4a70 am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit 'd409b70093211df215bc117ccf9ba8d0924e983f':
  Make 'fingerprint' searchable in Settings.
2015-07-21 15:44:21 +00:00
Julia Reynolds
f516e7dde0 Make 'fingerprint' searchable in Settings.
Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
2015-07-21 14:28:40 +00:00
Jason Monk
94f9c824c4 Don't show disabled apps in ignore optimizations
Bug: 22612760
Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d
2015-07-21 09:30:18 -04:00