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

17330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
58bb42f1d9 am 8c3f35a6: am 5fe578d8: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev 
* commit '8c3f35a659890fdd13a0c4da0b0a0b70a3d4b53b':
 2014-10-27 18:52:25 +00:00
vandwalle
18376c10ff am 7cc43f77: am 0490e707: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev 
* commit '7cc43f77184007c339c1202e5f5519ceafa30a7b':
 2014-10-27 18:52:24 +00:00
Fabrice Di Meglio
77bbe567f5 am f931c6db: am b517f4c5: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev 
* commit 'f931c6db857e2898f9c558acef8358d29130d139':
 2014-10-27 18:52:23 +00:00
PauloftheWest
aca87588e1 am a50ef37d: am 34f78835: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev 
* commit 'a50ef37de82ff3aa574230fc9c0027159a318048':
 2014-10-27 18:52:22 +00:00
John Spurlock
e31575db86 am 87fdccdc: am f1a24609: am 7e905488: Settings: Wire up new zen events config option. 
* commit '87fdccdc5706856d5ee9a474205e1d5b55db7634':
 2014-10-27 18:52:21 +00:00
Baligh Uddin
59231820ff am f6cb6bab: (-s ours) am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE 
* commit 'f6cb6bab0b225c7bfe4f9ddd07b10877e5d93769':
 2014-10-27 18:52:20 +00:00
PauloftheWest
e8bdd136a6 am 6ff1b3d3: am c43b84e3: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev 
* commit '6ff1b3d37b16872b720a00f4faa8899834da347c':
 2014-10-27 18:52:18 +00:00
PauloftheWest
a5f72825a8 am 55d5d83f: am 8f771c1f: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev 
* commit '55d5d83f38f9ee67f58eda25a378cb14f2d6f903':
 2014-10-27 18:52:17 +00:00
Baligh Uddin
76e39afa5b am 85c06226: (-s ours) am 3cf09bfe: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '85c0622678241addbc6be2f3fa2b1e20c90e61d9':
 2014-10-27 18:52:16 +00:00
Svetoslav
d4f7908a98 am c269be39: am e7416dbe: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit 'c269be392825341b29fa6b11047fc736e75580f2':
 2014-10-27 18:52:15 +00:00
Vinit Deshpande
9ff006b421 am 33812f49: am 749c39f0: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '33812f4934c3c8a0e2d3aeb3f89625bdc9777f55':
 2014-10-27 18:52:14 +00:00
Zoltan Szatmary-Ban
ab36fd983d am f8935010: am ddcb808b: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit 'f893501081fa2090315b70bd96ac6f5d1499b8dd':
 2014-10-27 18:52:13 +00:00
Matthew Xie
631dd2ea58 am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '231a81282a9ac8fcfb4f42c5819181c78e3b133d':
 2014-10-27 18:52:12 +00:00
PauloftheWest
0c32b376b8 am 58da4c37: am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '58da4c37276ba1102a4a524b2a56c0b5db0e477f':
 2014-10-27 18:52:11 +00:00
Sander Alewijnse
ef888ead0d am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
 2014-10-27 18:52:09 +00:00
Mark Salyzyn
54d56e6bb3 am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support 
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
 2014-10-27 18:52:08 +00:00
Amith Yamasani
84af5ffd89 am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit '2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
 2014-10-27 18:52:07 +00:00
John Spurlock
96cd925174 am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':
 2014-10-27 18:52:06 +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
Wink Saville
4aab7ecb56 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:35:44 +00:00
Geoff Mendal
855f0d2643 Import translations. DO NOT MERGE 
automerge: c7df50c  -s ours

* commit 'c7df50c5fdb8e4e3b26ff1647047e9e31c444994':
  Import translations. DO NOT MERGE
 2014-10-27 17:11:43 +00: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
Geoff Mendal
f571e511ba Import translations. DO NOT MERGE 
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
 2014-10-27 09:43:16 -07:00
Geoff Mendal
40f84ca020 Import translations. DO NOT MERGE 
Change-Id: Ifc5fc4573b40b501282cb71a17ba8c6873dc64c6
Auto-generated-cl: translation import
 2014-10-27 09:40:31 -07:00
vandwalle
30ac117228 prettify debug informations 
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
 2014-10-26 14:15:33 -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
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
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