OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 18:36:30 +0000 (18:36 +0000)]
am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '82b938c4aeb9522c3d78f904617836e43ea09bf2':
  Handle app uninstall via Storage & USB.

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

* commit '0c8bee9643717519c7d8ca7888068c7baf07b994':
  Handle app uninstall via Storage & USB.

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 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 agoam 715b4135: (-s ours) am aeae201d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 14:20:13 +0000 (14:20 +0000)]
am 715b4135: (-s ours) am aeae201d: (-s ours) Import translations. DO NOT MERGE

* commit '715b41355a01d8a5849eb689e20230d966ae9711':
  Import translations. DO NOT MERGE

9 years agoam aeae201d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 14:12:29 +0000 (14:12 +0000)]
am aeae201d: (-s ours) Import translations. DO NOT MERGE

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

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 c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translati...
Geoff Mendal [Sat, 25 Jul 2015 16:15:07 +0000 (16:15 +0000)]
am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
Adrian Roos [Sat, 25 Jul 2015 16:15:05 +0000 (16:15 +0000)]
am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec

* commit 'b87428a61d99b920f4e4704709f6f2974346aba8':
  Update FRP warning to spec

9 years agoam 48ea7098: (-s ours) am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 16:15:04 +0000 (16:15 +0000)]
am 48ea7098: (-s ours) am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE

* commit '48ea7098220e8600320143a12d8b0816789300d8':
  Import translations. DO NOT MERGE

9 years agoam 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 15:54:27 +0000 (15:54 +0000)]
am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE

* commit '7b5c7e56553cfe6d8bcca5b56f8f96772b6f98ef':
  Import translations. DO NOT MERGE

9 years agoam 5ada0050: am 38c9b9eb: Update FRP warning to spec
Adrian Roos [Sat, 25 Jul 2015 15:54:26 +0000 (15:54 +0000)]
am 5ada0050: am 38c9b9eb: Update FRP warning to spec

* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec

9 years agoam 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 15:53:32 +0000 (15:53 +0000)]
am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE

* commit '92ca0cbe8f0aab2d6efe59f384611275ea8aef00':
  Import translations. DO NOT MERGE

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 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 agoam 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during...
Maurice Lam [Fri, 24 Jul 2015 04:38:06 +0000 (04:38 +0000)]
am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit '11d1f6d3a135d85511fd5067012c29e4e17b346a':
  [Fingerprint] Show skip button during SUW

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

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

9 years agoam 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translati...
Geoff Mendal [Fri, 24 Jul 2015 03:26:34 +0000 (03:26 +0000)]
am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 03:26:33 +0000 (03:26 +0000)]
am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when...
Svetoslav Ganov [Fri, 24 Jul 2015 03:26:31 +0000 (03:26 +0000)]
am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

* commit '1fa5f4b33629a8995f44c56b3feb221ef0122477':
  Reset permissions and app links when clearing app preferences - settings

9 years agoam e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android...
Jason Monk [Fri, 24 Jul 2015 03:26:30 +0000 (03:26 +0000)]
am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

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

9 years agoam 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore...
Jason Monk [Fri, 24 Jul 2015 03:26:29 +0000 (03:26 +0000)]
am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev

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

9 years agoam b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage...
Guang Zhu [Fri, 24 Jul 2015 03:26:26 +0000 (03:26 +0000)]
am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

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

9 years agoam a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless...
Pavel Zhamaitsiak [Fri, 24 Jul 2015 03:26:25 +0000 (03:26 +0000)]
am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

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

9 years agoam b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings...
Jason Monk [Fri, 24 Jul 2015 03:26:23 +0000 (03:26 +0000)]
am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev

* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
  Remove tuner from development settings

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 agoam f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 03:13:06 +0000 (03:13 +0000)]
am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 28718aeb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 03:13:04 +0000 (03:13 +0000)]
am 28718aeb: (-s ours) Import translations. DO NOT MERGE

* commit '28718aebd187fe68cf923422cde80103b0f6cbca':
  Import translations. DO NOT MERGE

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

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

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

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 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
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

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

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

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 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 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstit...
Maurice Lam [Thu, 23 Jul 2015 19:46:31 +0000 (19:46 +0000)]
am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev

* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
  [ScreenLock] Style encryption interstitial in SUW

9 years agoam 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED...
Maurice Lam [Thu, 23 Jul 2015 19:46:29 +0000 (19:46 +0000)]
am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev

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

9 years agoam a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during...
Maurice Lam [Thu, 23 Jul 2015 19:46:28 +0000 (19:46 +0000)]
am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

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

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 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW...
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

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

9 years agoam ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard...
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

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 agoam 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 14:25:13 +0000 (14:25 +0000)]
am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE

* commit '741f3665dbd543ebd9abe0e9e3258ecbd07fa209':
  Import translations. DO NOT MERGE

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 agoam 0a167c40: (-s ours) Import translations. DO NOT MERGE
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

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 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 bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS...
Billy Lau [Tue, 21 Jul 2015 18:21:45 +0000 (18:21 +0000)]
am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev

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

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

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 c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change...
Amit Mahajan [Tue, 21 Jul 2015 17:30:59 +0000 (17:30 +0000)]
am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev

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

9 years agoam 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on...
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

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 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
Julia Reynolds [Tue, 21 Jul 2015 15:57:46 +0000 (15:57 +0000)]
am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.

* commit '6712be4a70ecd9d21ae78bf7dc65afc92b277937':
  Make 'fingerprint' searchable in Settings.

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

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 c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption...
Maurice Lam [Tue, 21 Jul 2015 01:19:47 +0000 (01:19 +0000)]
am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

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

9 years agoam e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encrypt...
Maurice Lam [Tue, 21 Jul 2015 01:04:50 +0000 (01:04 +0000)]
am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev

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

9 years agoam 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for Redaction...
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

9 years agoam d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial...
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

9 years agoam 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into...
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

9 years agoam 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial...
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

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