OSDN Git Service
Jason Monk [Fri, 24 Jul 2015 03:46:07 +0000 (03:46 +0000)]
am
c9607b39: am
e9b97364: am
14983fc6: am
8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '
c9607b39f8e34b1091f28a27c47fb4dc408fd57c':
Fix battery detail issues with "Android OS"
Jason Monk [Fri, 24 Jul 2015 03:46:06 +0000 (03:46 +0000)]
am
c19eac29: am
9b6ff57e: am
a119087b: am
9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '
c19eac29b6d439644e5fc5dc9504e126c61eb2e7':
Don't show disabled apps in ignore optimizations
Guang Zhu [Fri, 24 Jul 2015 03:46:04 +0000 (03:46 +0000)]
am
5ea94a9c: am
b91da24d: am
402c866c: am
c1bef743: Prevent monkey from changing adoptable storage settings
* commit '
5ea94a9c4d27d02d989ab8571bde97112bb1747e':
Prevent monkey from changing adoptable storage settings
Pavel Zhamaitsiak [Fri, 24 Jul 2015 03:45:57 +0000 (03:45 +0000)]
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
Jason Monk [Fri, 24 Jul 2015 03:45:55 +0000 (03:45 +0000)]
am
0557f4c3: am
b46b9934: am
6d8fdb82: am
838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '
0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
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"
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
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
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
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
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"
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
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
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
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
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"
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
Jason Monk [Thu, 23 Jul 2015 20:23:57 +0000 (20:23 +0000)]
Merge "Fix battery detail issues with "Android OS"" 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
Maurice Lam [Thu, 23 Jul 2015 20:09:28 +0000 (20:09 +0000)]
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
Maurice Lam [Thu, 23 Jul 2015 20:09:27 +0000 (20:09 +0000)]
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
Maurice Lam [Thu, 23 Jul 2015 20:09:26 +0000 (20:09 +0000)]
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge "Remove tuner from development settings" into mnc-dev
Geoff Mendal [Wed, 22 Jul 2015 14:38:32 +0000 (14:38 +0000)]
am
655698be: (-s ours) am
741f3665: (-s ours) am
0a167c40: (-s ours) Import translations. DO NOT MERGE
* commit '
655698be8ebe635e61d5d8215a7f0e3855877f0b':
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
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
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
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
Maurice Lam [Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)]
Merge "[ScreenLock] Style encryption interstitial in SUW" 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
Maurice Lam [Tue, 21 Jul 2015 23:38:34 +0000 (23:38 +0000)]
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
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
Billy Lau [Tue, 21 Jul 2015 18:36:48 +0000 (18:36 +0000)]
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)...
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)...
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)...
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)...
Amit Mahajan [Tue, 21 Jul 2015 17:44:46 +0000 (17:44 +0000)]
am
a38dfb03: am
c5459430: am
480692fa: am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
a38dfb03c4054dbe08ffab01b8d42329e91fd639':
Fix bug to force to close once change Bearer on APN
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
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
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
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
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
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
Julia Reynolds [Tue, 21 Jul 2015 16:10:31 +0000 (16:10 +0000)]
am
3d94772b: am
6712be4a: am
d409b700: am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
3d94772b082ff9e359e6ad9ebe2ea48292421966':
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.
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.
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.
Julia Reynolds [Thu, 16 Jul 2015 19:33:22 +0000 (15:33 -0400)]
Make 'fingerprint' searchable in Settings.
Bug:
22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
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
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
Maurice Lam [Tue, 21 Jul 2015 01:35:01 +0000 (01:35 +0000)]
am
3234f0b9: am
c690d199: am
d5af0d8b: am
d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit '
3234f0b9bdbe32658d1ebe33e278cfb5185a785b':
[ScreenLock] Change title of encryption interstitial
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
Maurice Lam [Tue, 21 Jul 2015 01:18:51 +0000 (01:18 +0000)]
am
b8c09951: am
e82793a2: am
6132fe1c: am
d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit '
b8c099519bfc93777de19095c9aa6030ca51b6cc':
[Fingerprint] Change message in encryption
Maurice Lam [Tue, 21 Jul 2015 01:18:49 +0000 (01:18 +0000)]
am
ec2f7fe5: am
135c8869: am
8ebd1e2c: am
af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit '
ec2f7fe57d7a210f226ddcb622e01cf4c45b25b2':
[ScreenLock] Change title for RedactionInterstitial
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
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
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
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
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
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
Maurice Lam [Tue, 21 Jul 2015 00:38:38 +0000 (00:38 +0000)]
Merge "[ScreenLock] Change title of encryption interstitial" 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
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
Maurice Lam [Tue, 21 Jul 2015 00:22:34 +0000 (00:22 +0000)]
Merge "[Fingerprint] Change message in encryption" 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
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
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
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
Jim Miller [Mon, 20 Jul 2015 23:38:06 +0000 (23:38 +0000)]
am
b858853d: am
a8f88798: am
d74a3603: am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
b858853dc395498acc75422e568d7156062c4f9c':
Don't launch ConfirmDeviceCredentials multiple times.
Jim Miller [Mon, 20 Jul 2015 23:28:14 +0000 (23:28 +0000)]
am
a8f88798: am
d74a3603: am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
a8f8879895edd86fd206fc1a8d2d684e09fcc57f':
Don't launch ConfirmDeviceCredentials multiple times.
Geoff Mendal [Mon, 20 Jul 2015 23:26:18 +0000 (23:26 +0000)]
am
88c6a310: (-s ours) am
e4af992f: (-s ours) am
a74f78b1: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
88c6a310db9495a83e093a173f1e451b622c5eae':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 23:26:17 +0000 (23:26 +0000)]
am
52c37bef: (-s ours) am
a6e9efbe: (-s ours) am
4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '
52c37befda5331cff8e618bdd7d5a63e4e32047e':
Import translations. DO NOT MERGE
Jim Miller [Mon, 20 Jul 2015 23:20:15 +0000 (23:20 +0000)]
am
d74a3603: am
3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
* commit '
d74a36031cbe87a8a18f4ffc99aaa399245f181c':
Don't launch ConfirmDeviceCredentials multiple times.
Geoff Mendal [Mon, 20 Jul 2015 23:06:47 +0000 (23:06 +0000)]
am
e4af992f: (-s ours) am
a74f78b1: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
e4af992fef82ab26670db5adc7957b4385baa86c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 23:06:46 +0000 (23:06 +0000)]
am
a6e9efbe: (-s ours) am
4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '
a6e9efbeb3bd83db0ad5d45a2bafb306935e02dd':
Import translations. DO NOT MERGE
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.
Geoff Mendal [Mon, 20 Jul 2015 22:57:40 +0000 (22:57 +0000)]
am
a74f78b1: (-s ours) am
1992d5a1: (-s ours) Import translations. DO NOT MERGE
* commit '
a74f78b188d11b0dfd7651aff77b2db4eae0278e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 22:57:38 +0000 (22:57 +0000)]
am
4a0662dd: (-s ours) Import translations. DO NOT MERGE
* commit '
4a0662dddeeea4fa9a62a97b5dd9e996860db7cd':
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
Jim Miller [Mon, 20 Jul 2015 22:50:29 +0000 (22:50 +0000)]
Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev
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
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
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
Maurice Lam [Mon, 20 Jul 2015 22:03:37 +0000 (15:03 -0700)]
[ScreenLock] Change title of encryption interstitial
Change the title of EncryptionInterstitial to "Secure start-up".
Bug:
22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
Maurice Lam [Mon, 20 Jul 2015 21:49:29 +0000 (14:49 -0700)]
[Fingerprint] Change message in encryption
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.
Bug:
22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
OSDN Git Service
