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
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
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
Amit Mahajan
dd871497f0
am e6e41f45: am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
...
* commit 'e6e41f453d608b443be315f5e1a223054bfd2b68':
Fix bug to force to close once change Bearer on APN
2015-07-21 17:58:22 +00:00
Billy Lau
e267fb3119
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)...
2015-07-21 17:54:00 +00:00
Amit Mahajan
e6e41f453d
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
2015-07-21 17:44:46 +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
a38dfb03c4
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
2015-07-21 17:30:59 +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
480692fab3
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
2015-07-21 17:09:12 +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
dd8f30541c
am 08b94d5b: am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
...
* commit '08b94d5b067fb68ba049aa611853bf102a4495d2':
Make 'fingerprint' searchable in Settings.
2015-07-21 16:23:52 +00:00
Julia Reynolds
08b94d5b06
am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
...
* commit '3d94772b082ff9e359e6ad9ebe2ea48292421966':
Make 'fingerprint' searchable in Settings.
2015-07-21 16:10:31 +00:00
Julia Reynolds
3d94772b08
am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.
...
* commit '6712be4a70ecd9d21ae78bf7dc65afc92b277937':
Make 'fingerprint' searchable in Settings.
2015-07-21 15:57:46 +00: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
d409b70093
am f516e7dd: Make \'fingerprint\' searchable in Settings.
...
* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
Make 'fingerprint' searchable in Settings.
2015-07-21 15:31:17 +00:00
Julia Reynolds
f516e7dde0
Make 'fingerprint' searchable in Settings.
...
Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
2015-07-21 14:28:40 +00:00
Daichi Hirono
35197218fc
Merge "Turn the eject menu into a button."
2015-07-21 06:14:37 +00:00
Maurice Lam
fed7de4546
am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683
am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit '6e512e0815c8678621077008498f18e73402ecc3':
[Fingerprint] Change message in encryption
2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb
am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:37:06 +00:00
Maurice Lam
d05774600e
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
2015-07-21 01:35:01 +00:00
Maurice Lam
3234f0b9bd
am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'c690d199be82337f3909348443391bbad081d37f':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:19:47 +00:00
Maurice Lam
6e512e0815
am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit 'b8c099519bfc93777de19095c9aa6030ca51b6cc':
[Fingerprint] Change message in encryption
2015-07-21 01:18:51 +00:00
Maurice Lam
d7615bbaac
am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit 'ec2f7fe57d7a210f226ddcb622e01cf4c45b25b2':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:18:49 +00:00
Maurice Lam
b8c099519b
am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit 'e82793a2de48be5334f3892d96e1e2736a3064c0':
[Fingerprint] Change message in encryption
2015-07-21 01:04:50 +00:00
Maurice Lam
ec2f7fe57d
am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit '135c8869fe4cc2cad8df07172c2f225da23ef07e':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:04:49 +00:00
Maurice Lam
c690d199be
am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'd5af0d8b8a973a2f82024f5358572b609e47a758':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:04:47 +00:00
Maurice Lam
e82793a2de
am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit '6132fe1c02a944bf87604a4773e091124de4954d':
[Fingerprint] Change message in encryption
2015-07-21 00:49:50 +00:00
Maurice Lam
135c8869fe
am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit '8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:49:49 +00:00
Maurice Lam
d5af0d8b8a
am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
[ScreenLock] Change title of encryption interstitial
2015-07-21 00:49:46 +00:00
Maurice Lam
d85fafce30
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
2015-07-21 00:38:39 +00:00
Maurice Lam
6132fe1c02
am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit 'd10026cbfde671448b702fde345da52ac7569d04':
[Fingerprint] Change message in encryption
2015-07-21 00:33:23 +00:00
Maurice Lam
8ebd1e2c06
am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:33:22 +00:00
Maurice Lam
d10026cbfd
Merge "[Fingerprint] Change message in encryption" into mnc-dev
2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
2015-07-21 00:22:03 +00:00
Jim Miller
9e81045a95
am 717f4879: am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev
...
* commit '717f487964b2e0029119b591f7f241e3262f7006':
Don't launch ConfirmDeviceCredentials multiple times.
2015-07-21 00:16:03 +00:00
Geoff Mendal
8e29907d4d
am d28d8d9d: (-s ours) am 88c6a310: (-s ours) am e4af992f: (-s ours) am a74f78b1: (-s ours) am 1992d5a1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd28d8d9d1896e530a45a533ab873cfa7009a480a':
Import translations. DO NOT MERGE
2015-07-21 00:15:25 +00:00
Geoff Mendal
3dd9586175
am 5eca3ca5: (-s ours) am 52c37bef: (-s ours) am a6e9efbe: (-s ours) am 4a0662dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '5eca3ca517192bed290c7b6e1bf8894d9a21bfc9':
Import translations. DO NOT MERGE
2015-07-21 00:15:23 +00:00
Makoto Onuki
b2121d9bdd
am 0968056b: am f5ac0b6a: am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit '0968056bac9c4eb808792eb6ae0b387899924b89':
Fix ugly text wrapping on non-english locales
2015-07-21 00:14:03 +00:00
