PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,950 Commits 1 Branch 0 Tags
b3047a47050c62173e11c00bcd8ad76c5366567c
Commit Graph

16950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
59864d2ce7 Minor cleanup in EncryptionInterstitial 
Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
 2014-10-24 15:41:44 -07:00
Michael Wright
ca6bc2aefa Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 
automerge: 95f29a1

* commit '95f29a1930244b9978a55073326c9fb071c2615f':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 22:33:50 +00: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
Sanket Padawe
6215d8dda9 Default sim name set to carrier name in sim settings automerge: 745046c 
automerge: 8d60883

* commit '8d60883ce4f10419c89282395277de60c25a7e4b':
  Default sim name set to carrier name in sim settings
 2014-10-24 21:29:41 +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
8d60883ce4 Default sim name set to carrier name in sim settings 
automerge: 745046c

* commit '745046c15783880eb7e8559c5fb41f8c87e634b3':
  Default sim name set to carrier name in sim settings
 2014-10-24 21:09:57 +00:00
Sanket Padawe
745046c157 Default sim name set to carrier name in sim settings 
Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.

Bug: 17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678
 2014-10-24 11:51:44 -07:00
Sanket Padawe
409fa9f97b am f6499e01: am 22eb414b: Set subscription id for "ask everytime" in sim settings 
* commit 'f6499e01376208bdeb26f05d02b98d7d04d1a3fb':
  Set subscription id for "ask everytime" in sim settings
 2014-10-24 18:44:16 +00:00
Sanket Padawe
f6499e0137 am 22eb414b: Set subscription id for "ask everytime" in sim settings 
* commit '22eb414bbd0b1d4c988d71f97a24a9ff48f5cf9b':
  Set subscription id for "ask everytime" in sim settings
 2014-10-24 18:39:30 +00:00
Sanket Padawe
22eb414bbd Set subscription id for "ask everytime" in sim settings 
Added default subscription id when user selects "Ask everytime"
while selecting sim card to select for phone calls.

Change-Id: I7f720f919850a85b65af648c9a7e078a0c05815e
 2014-10-24 18:24:51 +00:00
Sanket Padawe
35f83ca996 am 844c2a77: am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '844c2a77f44491ed8fec0e43919c4a3efae0acdf':
  WIP support icon
 2014-10-24 17:48:17 +00:00
Sanket Padawe
844c2a77f4 am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '7ff1718e1fb58b38ebfa4ec0d45e788c9acd2b5c':
  WIP support icon
 2014-10-24 17:42:48 +00:00
Sanket Padawe
7ff1718e1f am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '5fd97c551fb8cbcc43d762d9c609be1061cc5170':
  WIP support icon
 2014-10-24 17:39:21 +00: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
0f080f9d40 am 45ab2fe4: (-s ours) am 52e57d2d: (-s ours) am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE 
* commit '45ab2fe400cc0b6e50c76239f1d40c5b5daaa9ec':
  Import translations. DO NOT MERGE
 2014-10-23 22:24:11 +00:00
Amith Yamasani
d505dcbd66 am 95a5169d: am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit '95a5169d564466a68ae13e28494f8cefe6153e2f':
  Disable factory reset for secondary users
 2014-10-23 22:24:10 +00:00
Geoff Mendal
7b18e2f2fe am 78819ec3: (-s ours) am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '78819ec30af2139b04bd39dde35fbbe3eaf33bae':
  Import translations. DO NOT MERGE
 2014-10-23 22:24:09 +00:00
Baligh Uddin
45ab2fe400 am 52e57d2d: (-s ours) am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE 
* commit '52e57d2d252e585c034161173f605d773821c588':
  Import translations. DO NOT MERGE
 2014-10-23 22:16:13 +00:00
Amith Yamasani
95a5169d56 am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit '0e64404a9445c3e073480681d22720240a70f2c1':
  Disable factory reset for secondary users
 2014-10-23 22:16:12 +00:00
Geoff Mendal
78819ec30a am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f62af382665f7a8c6d4968a6cb15a0cfb638c505':
  Import translations. DO NOT MERGE
 2014-10-23 22:16:11 +00:00
Baligh Uddin
52e57d2d25 am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE 
* commit 'cc5b08b63c997acd13d566045d12ff232630e521':
  Import translations. DO NOT MERGE
 2014-10-23 22:10:38 +00:00
Amith Yamasani
0e64404a94 am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit '526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7':
  Disable factory reset for secondary users
 2014-10-23 22:10:38 +00: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
Geoff Mendal
f62af38266 am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5b7e25aa7cfa2e39f4168049eda0b435e87e147a':
  Import translations. DO NOT MERGE
 2014-10-23 00:14:41 +00: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
4561b9e834 am 1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '1303f19b5f11fe492e4531239c28ae807efc2e5b':
  Import translations. DO NOT MERGE
 2014-10-22 23:58:51 +00:00
Geoff Mendal
c07b54afa6 am 04fc60c4: (-s ours) am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '04fc60c4d37617eaad6c2b8bb6002c4679bb0f0a':
  Import translations. DO NOT MERGE
 2014-10-22 23:58:50 +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
1303f19b5f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-22 23:57:03 +00:00
Geoff Mendal
04fc60c4d3 am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8e2fb4c9c46dc15250c24083a312aeebbbf10d22':
  Import translations. DO NOT MERGE
 2014-10-22 23:55:52 +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
Geoff Mendal
bd265c947b Import translations. DO NOT MERGE 
Change-Id: I5df28d6eefcb0e0e3e2fc49baa1a751fa830319b
Auto-generated-cl: translation import
 2014-10-22 16:23:27 -07:00
Geoff Mendal
8e2fb4c9c4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-22 23:22:02 +00:00
Geoff Mendal
d5032606cc Import translations. DO NOT MERGE 
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
 2014-10-22 16:20:52 -07:00
Sanket Padawe
49c5efde90 am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes 
* commit '828f5df065320b3f798f64a8b032e5b7c0534a4c':
  SIM settings display name changes
 2014-10-22 21:40:30 +00:00
Paul Jensen
58fd281c1f am 23f4c425: am 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit '23f4c425a5855e72b0f0f1aa49329c37aef161c7':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 21:40:29 +00:00
Sanket Padawe
828f5df065 am 9fbff5a3: am 59dc8d1d: SIM settings display name changes 
* commit '9fbff5a31b4041906c14f2f3d015a1611adb5209':
  SIM settings display name changes
 2014-10-22 21:30:29 +00:00
Paul Jensen
23f4c425a5 am 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit '246273ae35035b99328a5300e84ecb93067627fc':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 21:30:28 +00:00
Sanket Padawe
f7fad6b6db am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit 'eee65f0417e879be499a15d006520b30618cc7c2':
  Commit with dialog box but using subinfo records
 2014-10-22 21:27:13 +00:00
Sanket Padawe
9fbff5a31b am 59dc8d1d: SIM settings display name changes 
* commit '59dc8d1db4c557ace1ded52122993be2e73f6863':
  SIM settings display name changes
 2014-10-22 21:22:25 +00:00
Paul Jensen
246273ae35 am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit 'a1640daf6202b12e64bcc26647449695f9ef2a61':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 21:22:20 +00:00
Sanket Padawe
eee65f0417 am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '286e3c4651fa0af76e092ea52349d5ae2235825d':
  Commit with dialog box but using subinfo records
 2014-10-22 21:08:13 +00: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
286e3c4651 am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '266e429657774dc7aa14029629a9e78c942c6104':
  Commit with dialog box but using subinfo records
 2014-10-22 20:45:40 +00: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