Baligh Uddin
960c98f91d
Import translations. DO NOT MERGE
...
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
2014-11-06 09:49:04 -08:00
Geoff Mendal
f6b609872c
Import translations. DO NOT MERGE
...
Change-Id: Ia602c0a9ac55f054d0c01cc742d085da1fcef19e
Auto-generated-cl: translation import
2014-11-03 10:07:02 -08:00
Geoff Mendal
4c79a9ecc0
Import translations. DO NOT MERGE
...
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
2014-10-29 13:38:11 -07:00
Geoff Mendal
c7df50c5fd
Import translations. DO NOT MERGE
...
Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import
2014-10-27 09:49:35 -07:00
Michael Wright
95f29a1930
Skip Misc/Overcounted battery stats in release builds.
...
automerge: f7a5017
* commit 'f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
Skip Misc/Overcounted battery stats in release builds.
2014-10-24 22:04:21 +00:00
Michael Wright
f7a5017fa6
Skip Misc/Overcounted battery stats in release builds.
...
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
2014-10-24 14:25:49 -07:00
Sanket Padawe
5fd97c551f
Merge "WIP support icon" into lmp-sprout-dev
2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe
WIP support icon
...
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
2014-10-24 10:17:08 -07:00
Baligh Uddin
cc5b08b63c
am 8d7fdc61
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
Import translations. DO NOT MERGE
2014-10-23 21:52:59 +00:00
Baligh Uddin
8d7fdc618a
Import translations. DO NOT MERGE
...
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
2014-10-23 14:37:38 -07:00
Amith Yamasani
526e4b4155
am c1dc8752
: Merge "Disable factory reset for secondary users" into lmp-dev
...
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
Disable factory reset for secondary users
2014-10-23 00:02:44 +00:00
Amith Yamasani
c1dc875224
Merge "Disable factory reset for secondary users" into lmp-dev
2014-10-22 23:59:19 +00:00
Geoff Mendal
5b7e25aa7c
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-22 23:57:24 +00:00
Geoff Mendal
82454b4721
Import translations. DO NOT MERGE
...
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
2014-10-22 16:29:28 -07:00
Amith Yamasani
4339a470d3
Disable factory reset for secondary users
...
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.
Bug: 18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
2014-10-22 13:51:53 -07:00
Sanket Padawe
59dc8d1db4
SIM settings display name changes
...
Resubmitting the change for displaying SIM name in SIM settings.
Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
2014-10-22 11:36:08 -07:00
Paul Jensen
a1640daf62
am d9b8d180
: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
...
* commit 'd9b8d1803aac44f382e330ea62bc936e049a1aed':
Launch browser directly when user selects "Mobile Plan".
2014-10-22 17:26:58 +00:00
Paul Jensen
d9b8d1803a
Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
2014-10-22 17:17:00 +00:00
Sanket Padawe
266e429657
Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
2014-10-21 21:56:06 +00:00
Sanket Padawe
a501137f26
Commit with dialog box but using subinfo records
...
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
2014-10-21 14:16:12 -07:00
Geoff Mendal
eda5136ba2
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-20 23:57:55 +00:00
Geoff Mendal
d335d4f395
Import translations. DO NOT MERGE
...
Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import
2014-10-20 16:52:16 -07:00
Geoff Mendal
6acdd044d7
am 795c8378
: (-s ours) Import translations. DO NOT MERGE
...
* commit '795c83780752d0301985d53e2e230c2088af825b':
Import translations. DO NOT MERGE
2014-10-20 23:41:26 +00:00
Geoff Mendal
795c837807
Import translations. DO NOT MERGE
...
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
2014-10-20 16:33:09 -07:00
Sanket Padawe
bdedbb8516
Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597
Changing settings UI changes related to strings to be displayed
...
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
2014-10-20 12:33:50 -07:00
Baligh Uddin
96a0370a2b
am 25149b38
: (-s ours) Import translations. DO NOT MERGE
...
* commit '25149b389501afc817f1248d704def0b4c5b5c04':
Import translations. DO NOT MERGE
2014-10-19 19:57:23 +00:00
Baligh Uddin
25149b3895
Import translations. DO NOT MERGE
...
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
2014-10-19 10:10:53 -07:00
Paul Jensen
d96c5fc70a
Launch browser directly when user selects "Mobile Plan".
...
Previously this used to send a broadcast to ConnectivityService
which would in turn launch the web browser. The ConnectivityService
code has since been removed, so just launch the browser directly.
bug:17472930
Change-Id: I5d419348efbb56b6c3c0fdbb8663efd0cfb2dde9
2014-10-18 15:33:33 -04:00
Jim Miller
456b866c09
am aa037675
: Fix bad string in EncryptionInterstitial
...
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
Fix bad string in EncryptionInterstitial
2014-10-18 02:09:26 +00:00
Jim Miller
aa03767598
Fix bad string in EncryptionInterstitial
...
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.
Fixes bug 17881324
Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
2014-10-17 18:28:52 -07:00
Jim Miller
bc0e5e2684
am 47adff0a
: Show warning dialog when Accessibility is enabled
...
* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
Show warning dialog when Accessibility is enabled
2014-10-18 01:20:53 +00:00
Jim Miller
47adff0a8b
Show warning dialog when Accessibility is enabled
...
This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".
Fixes bug 17881324
Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
2014-10-17 17:43:18 -07:00
Jim Miller
ba1b33407d
am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit '602d559d9c59074664ad684579dc3d14a09219cb':
Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:52:42 +00:00
Jim Miller
602d559d9c
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
2014-10-17 23:48:35 +00:00
Jim Miller
0698a21631
Several fixes to new EncryptionInterstitial dialog.
...
The code now observes whether accessibility is turned on when
deciding the default state.
Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.
Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.
Fixes bug 17881324
Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0
2014-10-17 16:11:59 -07:00
Svetoslav
edbada7acd
am ba202e9f
: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
...
* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:08:40 +00:00
Svetoslav
ba202e9fb2
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
2014-10-17 22:59:43 +00:00
Svetoslav
40ca78f6f3
Accessibility no longer overrides strong encryption (Settings).
...
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:17881324
Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
2014-10-17 14:41:58 -07:00
Amith Yamasani
06a314d65a
am e52c159c
: Fix some strings for the encryption stuff.
...
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
Fix some strings for the encryption stuff.
2014-10-17 21:02:34 +00:00
Amith Yamasani
e52c159cd9
Fix some strings for the encryption stuff.
...
Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
2014-10-17 13:42:14 -07:00
Jim Miller
c7ccba6859
am 4f903c3e
: Add strings for upcoming change.
...
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
Add strings for upcoming change.
2014-10-17 19:52:03 +00:00
Jim Miller
4f903c3e65
Add strings for upcoming change.
...
Fixes bug 17881324
Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
2014-10-17 12:18:42 -07:00
Svetoslav
431e246032
am 3ea423ae
: User to confirm credentials if an accessibility service changes encryption.
...
* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 16:56:40 +00:00
Svetoslav
3ea423ae0f
User to confirm credentials if an accessibility service changes encryption.
...
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
2014-10-16 17:35:07 -07:00
Geoff Mendal
9f0d372154
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-16 00:55:46 +00:00
Geoff Mendal
3ef104e5e0
Import translations. DO NOT MERGE
...
Change-Id: Ifd58c7a54faef6216bf534dac6d5fe99340d0083
Auto-generated-cl: translation import
2014-10-15 17:47:51 -07:00
Geoff Mendal
0172dfef41
am 4909c412
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db':
Import translations. DO NOT MERGE
2014-10-16 00:45:42 +00:00
Geoff Mendal
4909c412fa
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-16 00:38:03 +00:00
Geoff Mendal
c0a4136bbd
Import translations. DO NOT MERGE
...
Change-Id: I6ddb57a8bea2ad4ad1b6272e1f88f219e9cd8db0
Auto-generated-cl: translation import
2014-10-15 17:31:39 -07:00