PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,133 Commits 1 Branch 0 Tags
6bd45c0eba9058362a44135ca365b3d4b685be9d
Commit Graph

7266 Commits

Author SHA1 Message Date
Jim Miller
dd932476b9 Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 2014-10-25 01:01:17 +00:00
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
Wink Saville
b003a85941 Change subId to int from long 
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
 2014-10-24 15:08:44 -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
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
bdc0302872 am 409fa9f9: am f6499e01: am 22eb414b: Set subscription id for "ask everytime" in sim settings 
* commit '409fa9f97b13ba669ac0553251554e10758579c5':
  Set subscription id for "ask everytime" in sim settings
 2014-10-24 18:49:34 +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
61990241c1 am 35f83ca9: am 844c2a77: am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '35f83ca9966e22b5fe4a115114bd37ea1cb07847':
  WIP support icon
 2014-10-24 17:52:53 +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
Selim Gurun
4920f0fcfd Merge "Enable DRP only through command line." 2014-10-24 16:33:50 +00:00
Alexandra Gherghina
14819b0d3d Close account settings if there's no account to show 
This makes sure we don't keep the Settings screen on when there are no
accounts left to show.

Bug: 17713957
Change-Id: I6e1d6819477f051e3a521360aa3138b18fdd3fe2
 2014-10-24 17:00:38 +01:00
Selim Gurun
65723ffe12 Enable DRP only through command line. 
Enable DRP only through command line so remove it from dev settings. 

This reverts commit 7818de107a.

Change-Id: I2a3c60d9200b79a876ab69c7c495416a41108c39
 2014-10-24 14:48:30 +00:00
Amith Yamasani
52c3a2d719 am d505dcbd: am 95a5169d: am 0e64404a: am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit 'd505dcbd666d8a208d267ce9c78cf7b4d41c5142':
  Disable factory reset for secondary users
 2014-10-23 22:31:18 +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
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
Sanket Padawe
6fe1f8d4ae am 49c5efde: am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes 
* commit '49c5efde90d75f07f13f01493a77495701545969':
  SIM settings display name changes
 2014-10-22 22:51:07 +00:00
Paul Jensen
0f28275a81 am 58fd281c: am 23f4c425: am 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit '58fd281c1f038a382758ceab8f50ce405869d3db':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 22:51:06 +00:00
Sanket Padawe
480ce321ea am f7fad6b6: am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit 'f7fad6b6db1476f1972fc7399bead8937057906a':
  Commit with dialog box but using subinfo records
 2014-10-22 22:40:47 +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
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
Selim Gurun
146ab4684a Merge "Revert "Remove WebView DRP Setting from Developer Settings"" 2014-10-22 00:07:27 +00:00
Selim Gurun
7818de107a Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit 90886b8284.

Conflicts:
	src/com/android/settings/DevelopmentSettings.java

Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e
 2014-10-21 16:56:46 -07:00
Alexandra Gherghina
2999ce46c3 am 7574ee6a: am aadc070a: Move up spinner in apps screen 
automerge: 9dbaf77

* commit '9dbaf77696c21b7ab857d7048fbbf442a3d23308':
  Move up spinner in apps screen
 2014-10-21 22:57:20 +00:00
Sanket Padawe
a501137f26 Commit with dialog box but using subinfo records 
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
 2014-10-21 14:16:12 -07:00
Alexandra Gherghina
aadc070a35 Move up spinner in apps screen 
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
 2014-10-21 18:39:07 +01:00
Alexandra Gherghina
f9c546e79d am 74ebc630: am 8af56164: am 2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev 
* commit '74ebc630699030cb9986c28cf7f5416ae4fff979':
  Reset spinner selection
 2014-10-21 17:03:17 +00:00
Alexandra Gherghina
2f90c4cd52 Merge "Reset spinner selection" into lmp-mr1-dev 2014-10-21 16:49:24 +00:00
John Spurlock
e519a16545 am 12680faf: am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit '12680fafb7bdf67a8cf624e3533321c7df2aa11a':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:37:48 +00:00
John Spurlock
196aacebf9 Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev 2014-10-21 16:11:12 +00:00
Sanket Padawe
5e5e55c9f0 am 8299d519: am 4bcd973d: am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit '8299d519de97ca081ea8ab0cdd3256aae48c8f43':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 21:09:07 +00:00
Sanket Padawe
fbde761930 am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'bdedbb851699016a70eafdb82b038240646358c8':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:51:07 +00: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
John Spurlock
9a940cbf04 Settings: Display 'Calls' category on non-voice devices. 
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.

Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
 2014-10-20 14:22:38 -04: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
225fc3a83d am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial automerge: c8b2003 
automerge: 8baf923

* commit '8baf92359b0661b067de85e73d275f0421fc768a':
  Fix bad string in EncryptionInterstitial
 2014-10-18 03:32:10 +00:00
Jim Miller
880e49da16 am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled automerge: 06810c4 
automerge: 34927f8

* commit '34927f8a1e58e3b77ef7d6f7af52f62ab8aadc5d':
  Show warning dialog when Accessibility is enabled
 2014-10-18 03:32:04 +00:00
Jim Miller
3d3c870374 am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial 
* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial
 2014-10-18 02:20:59 +00: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
138d7b6273 am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled 
* commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
  Show warning dialog when Accessibility is enabled
 2014-10-18 01:31:03 +00:00