PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,592 Commits 1 Branch 0 Tags
96c2f8c50865e823e710be4d92f1589f978f03c2
Commit Graph

3536 Commits

Author SHA1 Message Date
Dianne Hackborn
1f6ddac9f4 If external storage is emulated, don't show it as separate entries. 
The installed app details UI is really complicted for the two-partition
internal and external storage case...  however, in our lovely new world
of emulated external storage, there is no reason for this, since the
external storage is using the same partition as internal storage.  So
in this case, don't show external storage as a separate item, just
combine it into the base app size and data size values.

Change-Id: Iea0e78f2d532ad50e20fef98740c93b2e897890a
 2012-07-12 16:26:44 -07:00
John Wang
022fa6c51a am e8b25302: am b0b45c02: Display FCC id for LTE in Settings. 
* commit 'e8b2530260abc74e570ae266b49bade240f14913':
  Display FCC id for LTE in Settings.
 2012-07-12 15:07:45 -07:00
John Wang
e8b2530260 am b0b45c02: Display FCC id for LTE in Settings. 
* commit 'b0b45c02ec73c87f78a8358a7e98747bd96ec103':
  Display FCC id for LTE in Settings.
 2012-07-12 14:29:13 -07:00
Wink Saville
f39f56d669 Merge commit '5543404a' into mit 
* commit '5543404a':
  Use telephony-common
 2012-07-11 18:11:15 -07:00
John Wang
b0b45c02ec Display FCC id for LTE in Settings. 
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.

bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
 2012-07-11 16:50:32 -07:00
Wink Saville
5543404ae0 Use telephony-common 
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
 2012-07-11 15:08:15 -07:00
Irfan Sheriff
5cf05f1081 am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off" 
* commit '7c8363eb11b61f712e982b161a2267c2731df6fa':
  wifi: update text displayed during hotspot on/off
 2012-07-03 12:23:21 -07:00
Irfan Sheriff
7c8363eb11 am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off" 
* commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f':
  wifi: update text displayed during hotspot on/off
 2012-07-03 12:18:33 -07:00
Irfan Sheriff
d80ff0a4d6 Merge "wifi: update text displayed during hotspot on/off" 2012-07-03 11:30:05 -07:00
Dianne Hackborn
3d3d4c891b am d601be8f: am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage 
* commit 'd601be8f945833ea95e6aaae769efb8ed26d964a':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:47:09 -07:00
Dianne Hackborn
d601be8f94 am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage 
* commit '313ab1727014d535790bc89afdcf725ff936e5b4':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:43:34 -07:00
Dianne Hackborn
313ab17270 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage 
The installed app details was not correctly distinguishing between cache and
normal data on external storage.  The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.

Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
 2012-06-29 15:01:23 -07:00
Brian Muramatsu
0d03b7885e am 1f1b9abd: am beb3d8b1: Merge "Fix Settings NPE" into jb-dev 
* commit '1f1b9abd0059bf7873e9a54288dc61d43ec39284':
  Fix Settings NPE
 2012-06-28 16:59:01 -07:00
Brian Muramatsu
1f1b9abd00 am beb3d8b1: Merge "Fix Settings NPE" into jb-dev 
* commit 'beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
  Fix Settings NPE
 2012-06-28 16:56:29 -07:00
Brian Muramatsu
c28af52e59 Fix Settings NPE 
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.

Bug 6727947

Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
 2012-06-28 14:25:14 -07:00
Jake Hamby
9cc7ca2996 resolved conflicts for merge of 8f12b128 to master 
Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
 2012-06-25 18:14:06 -07:00
Jake Hamby
8f12b1287f am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev 
* commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a':
  Add menu item to Settings to go to Cell Broadcast settings.
 2012-06-25 16:21:18 -07:00
Jake Hamby
ef57ed71bf Add menu item to Settings to go to Cell Broadcast settings. 
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
 2012-06-25 13:20:45 -07:00
Amith Yamasani
40db09f23f am 66b0ad57: am 9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev 
* commit '66b0ad5793ec329f756eb87b233f420697801539':
  Fix incorrect updating of headers in Settings
 2012-06-20 15:51:14 -07:00
Amith Yamasani
66b0ad5793 am 9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev 
* commit '9938ac8a6e1885b2cd7f35fd6c63e2b04a84d36c':
  Fix incorrect updating of headers in Settings
 2012-06-20 15:48:24 -07:00
Amith Yamasani
9938ac8a6e Merge "Fix incorrect updating of headers in Settings" into jb-dev 2012-06-20 15:45:05 -07:00
Amith Yamasani
ea7b28c2a1 Fix incorrect updating of headers in Settings 
Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.

This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.

Also make sure to invalidate headers on resume, so that the latest
account types are loaded.

Bug: 6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c
 2012-06-20 13:51:40 -07:00
Christopher Tate
90b3a16911 am 1b4a9b41: am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 
* commit '1b4a9b4107c1d6ba5b2ecf5657865acc24a28686':
  Use string resources instead of literals for backup password confirmations
 2012-06-19 16:36:24 -07:00
Christopher Tate
1b4a9b4107 am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
  Use string resources instead of literals for backup password confirmations
 2012-06-19 16:34:01 -07:00
Christopher Tate
5739d4fe02 Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 2012-06-19 16:31:11 -07:00
Christopher Tate
2d6497d2d1 Use string resources instead of literals for backup password confirmations 
Localizability is good.  Bug 6683158

Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
 2012-06-19 16:22:55 -07:00
Amith Yamasani
b9d64539b2 am f62df931: am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 
* commit 'f62df931faefaece80059af39742f123e8d7f4e9':
  Show full summary for network location sercice even for wifi-only devices
 2012-06-19 16:03:33 -07:00
Amith Yamasani
f62df931fa am 8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev 
* commit '8e1981ccd314bf3e41601314e78cc9626a4299af':
  Show full summary for network location sercice even for wifi-only devices
 2012-06-19 16:01:50 -07:00
Amith Yamasani
1270eb5e43 Show full summary for network location sercice even for wifi-only devices 
Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
 2012-06-19 10:53:49 -07:00
Dianne Hackborn
29c749b653 am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:52:33 -07:00
Dianne Hackborn
dba120535f am fe5a72da: am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 
* commit 'fe5a72dae2e7abc985b90641945e754492a20b67':
  Fix issue #6664140: Time to lock should work even Stay awake...
 2012-06-18 10:52:33 -07:00
Dianne Hackborn
2027328c7b am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:33:07 -07:00
Dianne Hackborn
fe5a72dae2 am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 
* commit 'ed99a81e1595c25d7070866ee0c2aa1d94103955':
  Fix issue #6664140: Time to lock should work even Stay awake...
 2012-06-18 10:33:00 -07:00
Dianne Hackborn
4d8dac0792 Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 2012-06-15 17:53:40 -07:00
Dianne Hackborn
f34a8d7517 Fix issue #6664140: Time to lock should work even Stay awake... 
...in Developer options is on

Disable the stay awake while on option in settings if a lock limit
is being enforced.

Bug: 6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3
 2012-06-15 17:07:14 -07:00
Nick Pelly
239f56ff91 Merge "Include WIFI scan time in per-application power usage summary." 2012-06-15 16:56:06 -07:00
Nick Pelly
cafe527dcd Include WIFI scan time in per-application power usage summary. 
Also, improve logging to more easily show power break-down for
each UID.

Bug: 6642581
Change-Id: Ib36f4bf9c8c579797225cf887e5b2d323cca61b0
 2012-06-15 16:14:23 -07:00
Dianne Hackborn
e458832c76 Implement issue #6633077: Improve permissions display for... 
...inherited permissions from shared UIDs

Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
 2012-06-15 11:00:17 -07:00
Amith Yamasani
c6dc91e1fa am e5147e49: am 5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev 
* commit 'e5147e4933e61c762f63b115e41c5aa8a2e37bd4':
  Show only the language if there's only one locale for the language.
 2012-06-14 10:33:05 -07:00
Danielle Millett
cfe8c4b0cd Fix 6654057: Fixing crash if device is rotated during confirm password 
In onActivityResult, mBiometricWeakLiveliness can be null if the device was rotated
during confirm password.  To fix this, the line accessing mBiometricWeakLiveliness can
safely be removed.  It's unnecessary because when onActivityResult finishes, onResume is
always called when it displays the security settings again.  Since onResume sets the
checkmark value based on the stored value in lockPatternUtils, the check mark will always
show the correct value when settings is displayed.

Change-Id: Idba9ae1d829911a9581bb6678c4d1f3b44784c63
 2012-06-14 11:59:10 -04:00
Amith Yamasani
e5147e4933 am 5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev 
* commit '5b7a8204d875c901782ff482b68fde8da7a0081f':
  Show only the language if there's only one locale for the language.
 2012-06-13 15:24:12 -07:00
Amith Yamasani
140b6f5234 Show only the language if there's only one locale for the language. 
If the system has only one instance of that language, then only show the language
without the country name.

Bug: 6522572
Change-Id: I1e99182b1c669b200090f6c360bb902376b63ab0
 2012-06-13 12:56:21 -07:00
Jeff Sharkey
df7375cb03 am c35b51f3: am cd4428ce: Storage banner when device in low disk state. 
* commit 'c35b51f3c7746c29672d15e1564b04103c8d32bf':
  Storage banner when device in low disk state.
 2012-06-12 18:57:04 -07:00
Jeff Sharkey
c35b51f3c7 am cd4428ce: Storage banner when device in low disk state. 
* commit 'cd4428ce2c03fd355a3093fad6553636da9cef9b':
  Storage banner when device in low disk state.
 2012-06-12 18:54:49 -07:00
Jeff Sharkey
cd4428ce2c Storage banner when device in low disk state. 
Bug: 6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
 2012-06-12 18:41:51 -07:00
Amith Yamasani
48fa857c92 UI to add a photo to a user's profile. 
Photo will be shown in user management screen and switcher.

Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
 2012-06-12 18:18:40 -07:00
Jean-Baptiste Queru
98880c4638 am 99f27dc5: Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp 
* commit '99f27dc554c7937bc1afbcae0c40e364d025ca2d':
  Swap start/stop of SettingsObserver and InputDeviceListener
 2012-06-12 16:00:33 -07:00
Jean-Baptiste Queru
093cf6094c Swap start/stop of SettingsObserver and InputDeviceListener 
Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
 2012-06-12 15:43:17 -07:00
Jean-Baptiste Queru
4ce87f0c88 am a6589134: Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit 'a65891347556b4d14f6dad829017513b984d20c1':
  Unregister ContentObserver in InputMethodAndLanguageSettings class
 2012-06-12 15:32:52 -07:00
Jean-Baptiste Queru
89d702ac68 resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp 
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
 2012-06-12 15:22:22 -07:00