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

16978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Jee
6fc08883ce am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit '000dd0a6b24a8c383a2051201699bd2c93bc4159':
 2014-10-27 18:52:00 +00:00
Edward Jee
cea371caf2 am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
 2014-10-27 18:51:59 +00:00
PauloftheWest
20cb5d9101 am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
 2014-10-27 18:51:58 +00:00
Dianne Hackborn
b453421f92 am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
 2014-10-27 18:51:57 +00:00
Dianne Hackborn
6a300d00aa am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
 2014-10-27 18:51:56 +00:00
Maurice Lam
6476e98139 am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window 
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
 2014-10-27 18:51:55 +00:00
PauloftheWest
c956628c74 am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
 2014-10-27 18:51:53 +00:00
Geoff Mendal
56e6248737 Import translations. DO NOT MERGE 
automerge: f571e51  -s ours

* commit 'f571e511ba5ff6eb54c5d15de445a62614d5e00e':
  Import translations. DO NOT MERGE
 2014-10-27 18:33:48 +00:00
Geoff Mendal
f571e511ba Import translations. DO NOT MERGE 
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
 2014-10-27 09:43:16 -07:00
Jim Miller
a30955a663 am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 
* commit '500ecf26d15d75fa5baa8bc98ff61792fa858857':
  Minor cleanup in EncryptionInterstitial
 2014-10-25 01:20:33 +00:00
Jim Miller
500ecf26d1 am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 
* commit 'dd932476b92f9d0e7ef8617d32a1d49d830b6787':
  Minor cleanup in EncryptionInterstitial
 2014-10-25 01:09:05 +00:00
Jim Miller
dd932476b9 Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 2014-10-25 01:01:17 +00:00
Michael Wright
56f8032a0c am 7f402457: am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1 
* commit '7f402457773721192d906af817db7256a4622e5e':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 23:27:51 +00:00
Michael Wright
7f40245777 am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1 
* commit 'ca6bc2aefad547d3ca3897b5ef8b8d5feafc7e2b':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 23:03:44 +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
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