PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,296 Commits 1 Branch 0 Tags
aca67a3c43e9a88cc9abff6a2db1ac9d21856b5c
Commit Graph

23296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
2ca86be437 am c0c0bf30: am 5cca5a5a: am b83cbe20: Fix build 
* commit 'c0c0bf30095a47b7a82df87b08e4d55bb2105350':
  Fix build
 2015-09-08 22:07:52 +00:00
Jorim Jaggi
c0c0bf3009 am 5cca5a5a: am b83cbe20: Fix build 
* commit '5cca5a5a2c54e3ca64df5a2dc7c7bdf4cecf6507':
  Fix build
 2015-09-08 22:02:24 +00:00
Jorim Jaggi
5cca5a5a2c am b83cbe20: Fix build 
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
  Fix build
 2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b Fix build 
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
 2015-09-08 21:42:17 +00:00
Jorim Jaggi
6599eb9af2 am 52aca96c: am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '52aca96c0bd1a52aab3e42c08b10fed7c5763773':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:36:04 +00:00
Jorim Jaggi
52aca96c0b am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '64ea62a30a416b46ecdb2042e052825b96702012':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:26:38 +00:00
Jorim Jaggi
64ea62a30a am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:17:06 +00:00
Jorim Jaggi
8c543276f1 Fix crash in fingerprint settings when rotating 
Fragments always need empty constructors.

Bug: 23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
 2015-09-08 20:43:16 +00:00
Geoff Mendal
8375466fe9 am 593714a8: (-s ours) am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit '593714a8d135f7ddafd2ae369cfd09777afdb8e5':
  Import translations. DO NOT MERGE
 2015-09-07 15:58:42 +00:00
Geoff Mendal
593714a8d1 am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit 'f1e6378a7e181fadd0ccd007dc7249d7ad250a24':
  Import translations. DO NOT MERGE
 2015-09-07 15:51:05 +00:00
Geoff Mendal
f1e6378a7e am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit 'f1a62026b83b54b5f234cd87df66fa32f754c914':
  Import translations. DO NOT MERGE
 2015-09-07 15:42:38 +00:00
Geoff Mendal
f1a62026b8 Import translations. DO NOT MERGE 
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
 2015-09-07 08:35:11 -07:00
Adam Lesinski
2350b8445c Update implementation to match BatteryStats.Uid 
Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
 2015-09-06 01:57:58 -07:00
Jason Monk
7af285b3fc am 3f2ac58c: am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '3f2ac58c932311fa61bc848af7aceec6f0f3a63d':
  Start tether service with redeliver intent
 2015-09-03 18:36:00 +00:00
Jason Monk
3f2ac58c93 am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '07b26bb3fcc35d990be7263afe546445d23938b2':
  Start tether service with redeliver intent
 2015-09-03 18:25:57 +00:00
Jason Monk
07b26bb3fc am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '1cfaf01fdaba22884a126a84748cf3a619785b3e':
  Start tether service with redeliver intent
 2015-09-03 18:14:51 +00:00
Jason Monk
1cfaf01fda Merge "Start tether service with redeliver intent" into mnc-dr-dev 2015-09-03 17:51:09 +00:00
Jason Monk
09ea9724fa Start tether service with redeliver intent 
So that the intent comes back when we are restarted rather than
null causing a crash.

Bug: 23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
 2015-09-03 12:50:01 -04:00
Jorim Jaggi
469447bb8c am bfacb5f4: am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit 'bfacb5f483b6fe8c117d8df9ab0a1bbe3909df26':
  Fix fingerprint settings ripples
 2015-09-03 06:23:58 +00:00
Maurice Lam
570852da18 am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit '84afdfdefaa935764aff589799b3ccf3a2fa06a1':
  [Fingerprint] Update strings for skip dialog
 2015-09-03 06:23:36 +00:00
Sungmin Choi
eeb5f8f1a2 am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit 'a43a40ffe7e55a4421635fc0a47ede295f2d61ed':
  To hide none security option, use config_hide_none_security_option config
 2015-09-03 06:22:57 +00:00
Geoff Mendal
10c447c2cd am 532ebb9f: (-s ours) am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE 
* commit '532ebb9f7afaf512567811fe8cdb9b74376b00c2':
  Import translations. DO NOT MERGE
 2015-09-03 06:21:36 +00:00
Jorim Jaggi
bfacb5f483 am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit '98d91550b624ca942fea7d096835c5bdf73f9af2':
  Fix fingerprint settings ripples
 2015-09-03 01:37:47 +00:00
Jorim Jaggi
98d91550b6 am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit 'c624a72be19027a0784fb41575129b334ff02ae7':
  Fix fingerprint settings ripples
 2015-09-03 01:28:51 +00:00
Jorim Jaggi
c624a72be1 Merge "Fix fingerprint settings ripples" into mnc-dr-dev 2015-09-03 01:19:28 +00:00
Jorim Jaggi
1e2433693a Fix fingerprint settings ripples 
Bug: 22471044
Bug: 23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
 2015-09-02 17:42:29 -07:00
Xiyuan Xia
6642a64210 am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit 'beebc95884e15bc53594a6fa63e1dd7736eb4b93':
  Fix races in ConfirmPassword/Pattern
 2015-09-03 00:34:15 +00:00
Maurice Lam
84afdfdefa am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit '82db64e940905a18aae4e716f361b6a9a72d0a4e':
  [Fingerprint] Update strings for skip dialog
 2015-09-02 23:54:52 +00:00
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
 2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog 
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
 2015-09-02 14:36:19 -07:00
Sungmin Choi
a43a40ffe7 am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit 'e31208ae1c253b35edd34192f49c14a59bbd8c13':
  To hide none security option, use config_hide_none_security_option config
 2015-09-02 21:25:25 +00:00
Sungmin Choi
e31208ae1c am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit '05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
  To hide none security option, use config_hide_none_security_option config
 2015-09-02 21:02:58 +00:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config 
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.

Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
 2015-09-02 13:51:44 -07:00
Geoff Mendal
532ebb9f7a am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE 
* commit '8ee8b37933b52d8f495cb9317b02f4843aa090bb':
  Import translations. DO NOT MERGE
 2015-09-02 14:28:48 +00:00
Geoff Mendal
8ee8b37933 am e182fa77: (-s ours) Import translations. DO NOT MERGE 
* commit 'e182fa77888d0b42b4896f031e7b1d8c88a62a4c':
  Import translations. DO NOT MERGE
 2015-09-02 14:18:54 +00:00
Geoff Mendal
e182fa7788 Import translations. DO NOT MERGE 
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
 2015-09-02 07:05:31 -07:00
Xiyuan Xia
beebc95884 am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit '676a4b65b18a97851c6762446b8236ca941cd0a3':
  Fix races in ConfirmPassword/Pattern
 2015-09-01 20:53:56 +00:00
Xiyuan Xia
676a4b65b1 am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit '50e1f59a6891cbf3995db0e7fc811f018f9ba63a':
  Fix races in ConfirmPassword/Pattern
 2015-09-01 20:39:58 +00:00
Xiyuan Xia
50e1f59a68 Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 2015-09-01 20:29:41 +00:00
Jason Monk
de750e8cf1 am 2ffca0c5: am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit '2ffca0c52a770dfe610d492fa9ba8328b79c85f7':
  Protect against multiple provision responses
 2015-09-01 19:28:25 +00:00
Jason Monk
2ffca0c52a am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit 'b39ceab718f0265be3c7e8bf9df1ab0917b5307b':
  Protect against multiple provision responses
 2015-09-01 19:21:03 +00:00
Xiyuan Xia
4e4850802b am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit '060ce6b5a77e629a1a317f7fe4c2c62fc5ed3c04':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 19:15:28 +00:00
Jason Monk
b39ceab718 am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit '65b0666d36896c0c5616f867af5396c036ed1cb6':
  Protect against multiple provision responses
 2015-09-01 19:10:12 +00:00
Xiyuan Xia
060ce6b5a7 am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit '9e06cbf5a379d0a05f13d2a6e1660793fb7015a3':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 19:07:30 +00:00
Jason Monk
65b0666d36 Merge "Protect against multiple provision responses" into mnc-dr-dev 2015-09-01 19:02:44 +00:00
Xiyuan Xia
9e06cbf5a3 am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit 'a104c05da9d42375f7307cce58039f7edafaa078':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 18:54:08 +00:00
Xiyuan Xia
a104c05da9 Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 2015-09-01 18:46:19 +00:00
Xiyuan Xia
e47a2ab83e Fix wrong stage exception in ChooseLockPattern 
ChooseLockPattern should updateStage instead of always enabling
pattern view input.

Bug:22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
 2015-09-01 11:29:36 -07:00
Jason Monk
359170f4b0 Protect against multiple provision responses 
Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
 2015-09-01 13:20:55 -04:00