PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,667 Commits 1 Branch 0 Tags
cd9bf25db658ac3f70f8a4b99f8e270e9f6fa631
Commit Graph

17667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
cd9bf25db6 am 4a62d8e6: am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation. 
* commit '4a62d8e69f095b301ff323fba7bd87111cfb6c73':
 2014-10-27 20:38:03 +00:00
Maurice Lam
6f2f7812fa am 69ea67b6: am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '69ea67b60ada436ace48ddf89539fb852d98e3ec':
 2014-10-27 20:38:02 +00:00
Baligh Uddin
3ca01626ca am 70aabfde: (-s ours) am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '70aabfde6136de5684d6818728c5e41128f9a895':
 2014-10-27 20:38:01 +00:00
PauloftheWest
2b88d51ccf am a186ce83: am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'a186ce831f3f346a302ca1d3e69b4cbad9687610':
 2014-10-27 20:38:00 +00:00
Edward Jee
863d8fc013 am 6fc08883: am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit '6fc08883cebe328fd92f289502cfb73fe3c29f5a':
 2014-10-27 20:37:59 +00:00
Edward Jee
22bc49035c am cea371ca: 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 'cea371caf2db6d0d5180e0dcf4100cf631aa3444':
 2014-10-27 20:37:58 +00:00
PauloftheWest
115916a579 am 20cb5d91: am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '20cb5d910138877b312c13f22385792402ac2c4a':
 2014-10-27 20:37:57 +00:00
Dianne Hackborn
d7760f77ef am b453421f: am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit 'b453421f92c0b43518cf15c9785c5dd4877225fc':
 2014-10-27 20:37:56 +00:00
Dianne Hackborn
f0f7f1802a am 6a300d00: am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit '6a300d00aab43f123ace45e2fc70a573ab53d635':
 2014-10-27 20:37:54 +00:00
Maurice Lam
c3189476dd am 6476e981: am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window 
* commit '6476e98139459e49be4547d2cbcdf8087ef8d219':
 2014-10-27 20:37:53 +00:00
PauloftheWest
2d7e3814c4 am c956628c: am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev 
* commit 'c956628c74b29078fb4a80352ac4080278e830c3':
 2014-10-27 20:37:52 +00:00
Geoff Mendal
52732b3f40 am 56e62487: (-s ours) Import translations. DO NOT MERGE automerge: f571e51 -s ours 
* commit '56e6248737ba2d090fc4826c5eb265a29776670d':
  Import translations. DO NOT MERGE
 2014-10-27 20:37:51 +00:00
PauloftheWest
4a62d8e69f am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation. 
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
 2014-10-27 18:52:05 +00:00
Maurice Lam
69ea67b60a am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
 2014-10-27 18:52:04 +00:00
Baligh Uddin
70aabfde61 am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
 2014-10-27 18:52:03 +00:00
PauloftheWest
a186ce831f am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
 2014-10-27 18:52:02 +00:00
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
1cb2797744 Import translations. DO NOT MERGE 
Change-Id: Ic88453a3d2b7eb50fc739869dc84d3cbce836d6b
Auto-generated-cl: translation import
 2014-10-27 10:03:05 -07: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
a3ff1a3fbe am a30955a6: am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 
* commit 'a30955a6634323dfc1ed2704ce0ca2f4f19d3ef3':
  Minor cleanup in EncryptionInterstitial
 2014-10-25 03:42:06 +00:00
Michael Wright
3f9b6331d6 am 56f8032a: am 7f402457: am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1 
* commit '56f8032a0c826019ac5588dc2f059a4bf00a0455':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-25 02:36:55 +00:00
Sanket Padawe
a34e092c07 am 6215d8dd: Default sim name set to carrier name in sim settings automerge: 745046c automerge: 8d60883 
* commit '6215d8dda9a94bb7dcacb483b3a26cdd39e299eb':
  Default sim name set to carrier name in sim settings
 2014-10-25 02:35:52 +00: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
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
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
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
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