Guang Zhu
5e83b0d9fa
am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
...
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
Prevent monkey from changing adoptable storage settings
2015-07-24 04:50:00 +00:00
Pavel Zhamaitsiak
2fab133a24
am 5d652622: am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
...
* commit '5d652622e836738cff848ec4597ddaca92658db5':
Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 04:49:59 +00:00
Colin Cross
dab025bdff
resolved conflicts for merge of 769ba03b to master
...
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Guang Zhu
29936b072f
am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
...
* commit '5ea94a9c4d27d02d989ab8571bde97112bb1747e':
Prevent monkey from changing adoptable storage settings
2015-07-24 03:46:04 +00:00
Pavel Zhamaitsiak
5d652622e8
am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
...
* commit 'ff381a20ca92597614f35507b663fdbcf8341cbf':
Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 03:45:57 +00:00
Jason Monk
769ba03b8f
am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Guang Zhu
5ea94a9c4d
am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
...
* commit 'b91da24db774829315087af3af09c90e89f496cb':
Prevent monkey from changing adoptable storage settings
2015-07-24 03:26:26 +00:00
Pavel Zhamaitsiak
ff381a20ca
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
2015-07-24 03:26:25 +00:00
Jason Monk
0557f4c353
am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
Remove tuner from development settings
2015-07-24 03:26:23 +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
Geoff Mendal
e9f9ea3aff
Import translations. DO NOT MERGE
...
Change-Id: Ib963e118d1a07d17e7fa824a39f72d6611366804
Auto-generated-cl: translation import
2015-07-23 17:57:24 -07:00
Maurice Lam
95d1eb90d3
am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:26:15 +00:00
Maurice Lam
4e05ceea19
am 3b798650: am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
...
* commit '3b798650fc30a6b2b3b7a28325b7b40b8173baf1':
[Fingerprint] Send RESULT_CANCELED when back from Add another
2015-07-23 20:26:14 +00:00
Maurice Lam
1f95e5125f
am 3f7ff2b6: am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit '3f7ff2b60f85cf9bb39e3bb3551bcdbfa916fafa':
[ScreenLock] Update illustration during setup wizard
2015-07-23 20:26:12 +00:00
Maurice Lam
cff4eb9b73
am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:09:28 +00:00
Maurice Lam
3b798650fc
am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
...
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
[Fingerprint] Send RESULT_CANCELED when back from Add another
2015-07-23 20:09:27 +00:00
Maurice Lam
3f7ff2b60f
am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit '391e65e46594553515036cff019c9faaa2f2faf5':
[ScreenLock] Update illustration during setup wizard
2015-07-23 20:09:26 +00:00
Maurice Lam
ea0f0fdfa2
am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 19:46:31 +00:00
Maurice Lam
06dc59305f
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
2015-07-23 19:46:29 +00:00
Maurice Lam
391e65e465
am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'a5fa39dd13552886ebe9903fcbd6084a9521fd16':
[ScreenLock] Update illustration during setup wizard
2015-07-23 19:46:28 +00:00
Guang Zhu
402c866c31
am c1bef743: Prevent monkey from changing adoptable storage settings
...
* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
Prevent monkey from changing adoptable storage settings
2015-07-23 19:32:40 +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
Maurice Lam
a5fa39dd13
am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'ad904de84644ab72754fe7d0cc5a34d1928c03f1':
[ScreenLock] Update illustration during setup wizard
2015-07-23 19:18:48 +00:00
Pavel Zhamaitsiak
bdc3fc3672
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
2015-07-23 19:13:06 +00:00
Jason Monk
6d8fdb8294
am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
Remove tuner from development settings
2015-07-23 19:13:05 +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
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
9b6bd390f9
am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
[ScreenLock] Style encryption interstitial in SUW
2015-07-22 20:23:18 +00:00
Maurice Lam
f1fbf9cca4
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
2015-07-22 20:23:17 +00:00
Maurice Lam
ad904de846
am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
[ScreenLock] Update illustration during setup wizard
2015-07-22 20:23:15 +00:00
Jason Monk
838c843217
Merge "Remove tuner from development settings" into mnc-dev
2015-07-22 19:29:59 +00:00
Maurice Lam
9e1429a54b
Merge "[Fingerprint] Add strings for fingerprint during SUW"
2015-07-22 18:27:43 +00:00
Maurice Lam
760c4f1b5d
[Fingerprint] Add strings for fingerprint during SUW
...
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
2015-07-22 11:21:31 -07:00
Geoff Mendal
a65188fefc
am 7840a5cb: (-s ours) am 655698be: (-s ours) am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE
...
* commit '7840a5cb9a28534eeec8333f9fb1f4c3d81b6ccb':
Import translations. DO NOT MERGE
2015-07-22 14:52:16 +00:00
Geoff Mendal
7840a5cb9a
am 655698be: (-s ours) am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE
...
* commit '655698be8ebe635e61d5d8215a7f0e3855877f0b':
Import translations. DO NOT MERGE
2015-07-22 14:38:32 +00:00
Geoff Mendal
655698be8e
am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE
...
* commit '741f3665dbd543ebd9abe0e9e3258ecbd07fa209':
Import translations. DO NOT MERGE
2015-07-22 14:25:13 +00:00
Geoff Mendal
741f3665db
am 0a167c40: (-s ours) Import translations. DO NOT MERGE
...
* commit '0a167c400af710fe97d7491abdffbe54bec42761':
Import translations. DO NOT MERGE
2015-07-22 14:10:23 +00:00
Geoff Mendal
0a167c400a
Import translations. DO NOT MERGE
...
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
2015-07-22 06:59:04 -07:00
Geoff Mendal
9c17fab30f
Import translations. DO NOT MERGE
...
Change-Id: I06e1210f46fc7a5e9e822b4bb4d11f7531c2c5eb
Auto-generated-cl: translation import
2015-07-22 06:11:39 -07: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
Maurice Lam
e44ceed122
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
2015-07-21 23:38:34 +00: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
2e407c317a
am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
...
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:51:31 +00:00
Billy Lau
90bc96f83d
am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
...
* commit 'f7011298eda26b6972a36a9735182fa6afd35093':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:36:48 +00:00
Billy Lau
f7011298ed
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)...
2015-07-21 18:21:45 +00:00
