PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,931 Commits 1 Branch 0 Tags
c2c89bf82f89b3913e61d922317f294a515d359c
Commit Graph

15931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
c2c89bf82f am a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'a535fcb5b3a3329d40214f9cf215c49b6b4719ad':
 2014-09-15 23:55:03 +00:00
Fabrice Di Meglio
f6713c2a17 am bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'bcd1ff97448f9b9c0dd31f20ab7f3f8108e36b8d':
 2014-09-15 23:55:02 +00:00
Dan Sandler
bb533452be am 2f64d506: am b58b5127: Fix links to notification settings activities. 
* commit '2f64d506e0823a67d9985f25232ef4c17ac14082':
 2014-09-15 23:55:01 +00:00
Vinit Deshpande
b89d110980 am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '05725beb3565d1eecc3c59995f3c3642d85b5556':
 2014-09-15 23:55:00 +00:00
Amith Yamasani
25661d68fd am 12997ecd: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '12997ecd97f0a1c4bbcd187e5009be133af5a790':
 2014-09-15 23:54:59 +00:00
PauloftheWest
4a20069dc0 am 43454701: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit '43454701c670451dc92bf0ac9240366623c37577':
 2014-09-15 23:54:58 +00:00
Jason Monk
710b8857a8 am c8d9504e: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit 'c8d9504eea4f144ec99ad1ee3d5ca5ada2ca7792':
 2014-09-15 23:54:57 +00:00
Paul Lawrence
f88a60f09e am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit '8826a64a6cd4a44b55033557e5b4867bcf131e35':
 2014-09-15 23:54:56 +00:00
Maurice Lam
2b193bc952 am 8efe9278: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit '8efe92789ec32f7bf6f890d1196a152902212322':
 2014-09-15 23:54:55 +00:00
PauloftheWest
dbfc2fe1b3 am 9fef5db8: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit '9fef5db88e9f67bcf54e5c1668b7475f948fb948':
 2014-09-15 23:54:54 +00:00
Fabrice Di Meglio
72c7d7052c am 8bde623e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit '8bde623e6574467e0417837ce98aee28674d9de2':
 2014-09-15 23:54:53 +00:00
Dan Sandler
2a1249225f am c8c5091f: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit 'c8c5091f2612f2e74eb678727da7fb1e80210de3':
 2014-09-15 23:54:53 +00:00
PauloftheWest
84acfc617e am a8d4b005: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'a8d4b00508c6cfc975a47d956f2c460ef375c8cc':
 2014-09-15 23:54:52 +00:00
Baligh Uddin
7ddba4418b am 25728d22: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '25728d220a3fa5cc40d20e436ca72f24a85a365c':
 2014-09-15 23:54:50 +00:00
Baligh Uddin
487e923551 am d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd7697f0f113536d65a811e8def4a2a2c4eae827a':
  Import translations. DO NOT MERGE
 2014-09-15 23:54:48 +00:00
Wink Saville
ea569f4817 am 98365869: ksd to lmp-sprout-dev 
* commit '983658696be22aa55dc5b37c666cedb8826ded83':
  ksd to lmp-sprout-dev
 2014-09-15 23:54:47 +00:00
Prem Kumar
1097e836e4 am 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit '2ce5440203684e064102ba3e7ce9bccec4a76610':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:15:04 +00:00
Prem Kumar
2ce5440203 am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 
* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
  Remove UI for Forget AP as a secondary user.
 2014-09-15 00:00:25 +00:00
Prem Kumar
c0deb7dac0 Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 2014-09-14 23:51:21 +00:00
John Spurlock
3ea47dd063 am 89147d72: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit '89147d726b0f3c4e69f3028c8043f71c14bc6f81':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 20:09:40 +00:00
John Spurlock
89147d726b am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 
* commit '2e205e9b4b16133b29efba91e67bee8f20a51a88':
  Settings: Use new PowerManager call to set low power mode.
 2014-09-14 19:51:01 +00:00
John Spurlock
2e205e9b4b Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev 2014-09-14 19:36:20 +00:00
John Spurlock
41e8351448 Settings: Use new PowerManager call to set low power mode. 
Bind the master switch to the power manager state instead
of directly to the single setting.

Depends on frameworks/base change:
  Ic030504c9cad9868a7137abbe837b170da37852b

Bug:17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
 2014-09-14 11:23:01 -04:00
Tyler Gunn
0950409350 am d03caf70: am 3e71b197: Renaming Telecomm to Telecom. 
* commit 'd03caf70865f50f74db2613f9d0c68ee50e22190':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:11 +00:00
Tyler Gunn
d03caf7086 am 3e71b197: Renaming Telecomm to Telecom. 
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
  Renaming Telecomm to Telecom.
 2014-09-13 17:47:28 +00:00
Tyler Gunn
3e71b197f7 Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
 2014-09-12 20:22:25 -07:00
Paul Lawrence
fd2a303616 am dbb4a6b7: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'dbb4a6b704e8feaba5f31623c66ee30fef8af680':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 23:22:13 +00:00
Paul Lawrence
dbb4a6b704 am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 
* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
  Prevent PIN/Passwword disappearing during boot
 2014-09-12 22:05:22 +00:00
Paul Lawrence
c64c9808b9 Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev 2014-09-12 21:44:48 +00:00
Kenny Guy
31095ca6e5 am f57f94e9: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'f57f94e973b9fba78d08301568b109d983d0b425':
  Fix crash when showing accounts.
 2014-09-12 20:02:39 +00:00
Kenny Guy
f57f94e973 am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev 
* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
  Fix crash when showing accounts.
 2014-09-12 19:37:38 +00:00
Paul Lawrence
5ab67c5648 Prevent PIN/Passwword disappearing during boot 
During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.

Ignore this change since it is immaterial to what we display.

Bug: 17421115

Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276
 2014-09-12 12:35:18 -07:00
Kenny Guy
db9e3f682f Merge "Fix crash when showing accounts." into lmp-dev 2014-09-12 19:17:10 +00:00
Alexandra Gherghina
02d41b916c am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit '0bf3dc02ce5fa69271ba993b3d2ed0689c292002':
  Switch to using system-wide default user icons
 2014-09-12 18:53:19 +00:00
PauloftheWest
5bebfebee7 am 7f7aa9dc: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '7f7aa9dc60602298218cc573e8d30db222bb4442':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 18:53:18 +00:00
Kenny Guy
7b72e2835b Fix crash when showing accounts. 
Accounts page crashed when showing a disabled
manged profile.

Bug: 17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
 2014-09-12 19:49:11 +01:00
Alexandra Gherghina
0bf3dc02ce am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev 
* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
  Switch to using system-wide default user icons
 2014-09-12 17:31:21 +00:00
PauloftheWest
7f7aa9dc60 am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
  Fixed multiple Bluetooth Settings crashes.
 2014-09-12 17:31:20 +00:00
Alexandra Gherghina
f738895dc0 Merge "Switch to using system-wide default user icons" into lmp-dev 2014-09-12 16:03:53 +00:00
Alexandra Gherghina
bc6e78f9da Switch to using system-wide default user icons 
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.

Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
 2014-09-12 17:00:40 +01:00
PauloftheWest
37b1253a01 Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev 2014-09-12 13:06:42 +00:00
Dianne Hackborn
a1b53ad6c4 am 901df0c3: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 
* commit '901df0c3744e16d5a86e377583ea96d5a8b687dc':
  Fix some things in settings: manage apps, battery, procstats
 2014-09-12 05:48:45 +00:00
Svetoslav
12c465148f am 06157a11: am 85dcef12: Fix settings crash in print job screen. 
* commit '06157a11cd16116a04596235dfac139ae1fb01f8':
  Fix settings crash in print job screen.
 2014-09-12 05:48:44 +00:00
Dianne Hackborn
901df0c374 am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 
* commit 'a5780340fcf8f8910f1aa1197c604be32ff6a5cf':
  Fix some things in settings: manage apps, battery, procstats
 2014-09-12 05:09:07 +00:00
Svetoslav
06157a11cd am 85dcef12: Fix settings crash in print job screen. 
* commit '85dcef12263f3cbae05240a155e92e7cf386d58f':
  Fix settings crash in print job screen.
 2014-09-12 05:06:32 +00:00
Dianne Hackborn
a5780340fc Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev 2014-09-12 02:24:17 +00:00
Dianne Hackborn
c891ce6565 Fix some things in settings: manage apps, battery, procstats 
Issue #17461567: java.lang.ArithmeticException: divide by zero when
looking at Settings > Battery

Yeah, let's not do that.

Issue #17365562: Running services RAM totals are wrong

Okay so like a few months ago, I had this vacation coming up, and
it was around the feature complete (hahah) deadline, and I had to
rush to get this in before I left.  So I rushed.  And, well, I forgot
a few things.  Here they are.  We now show the right numbers and
even update things correctly when you change what processes are
being shown.  Wow.

Finally, fixed a few issues in the dev tools procstats UI.

Change-Id: I8348a9c2ec3226a455c5c8465729e4487f324c8b
 2014-09-11 18:09:29 -07:00
Svetoslav
85dcef1226 Fix settings crash in print job screen. 
The code was looking up the print job from the print manager
based on the lifecycle event of the hosting fragment. There
was a case missing and the print job not initialized on
rotation. This change looks up the job lazily making the
code more robust.

bug:17471952

Change-Id: I00075e161f69ca711bac6857f5ec00c20b5b17a0
 2014-09-11 14:30:18 -07:00
PauloftheWest
8d6991348b Fixed multiple Bluetooth Settings crashes. 
+ Fixed a crash when selecting On/Off multiple times on an input device.
+ Fixed a crash when visiting different Bluetooth Settings after
disabling an input device.

Bug: 17402421
Change-Id: I23efa3a36ba8cf0df02cf41397586a10dae9e08c
 2014-09-11 12:36:58 -07:00
Vinit Deshpande
eaacf6a4fd am 57bef54b: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 
* commit '57bef54befac21bc43aee60ba9ea8f5e1a6c039d':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
 2014-09-11 18:39:40 +00:00