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

16024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
8678d40642 am 0fff8d13: am c465867b: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit '0fff8d13eda2b0da4086f752c3246eac2ce9eace':
  Put VPN settings under primary profile control
 2014-09-04 13:05:00 +00:00
Zoltan Szatmary-Ban
0fff8d13ed am c465867b: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit 'c465867bde16b7e1fe6c6d3e6d33031a266e6aea':
  Put VPN settings under primary profile control
 2014-09-04 12:55:57 +00:00
Zoltan Szatmary-Ban
c465867bde am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev 
* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control
 2014-09-04 12:45:17 +00:00
Zoltan Szatmary-Ban
c91d2cd082 Merge "Put VPN settings under primary profile control" into lmp-dev 2014-09-04 12:38:48 +00:00
Zoltan Szatmary-Ban
9d89e3ee70 am e7e84cd1: am 0635a3b9: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit 'e7e84cd1e7c5b0d6e21640c6c17ef470c9d63e1d':
  Start activity for the correct user in Settings > Data Usage
 2014-09-04 12:26:05 +00:00
Zoltan Szatmary-Ban
e7e84cd1e7 am 0635a3b9: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '0635a3b9dd3644ef8e96e4cf6c65adfb7bf8eeb4':
  Start activity for the correct user in Settings > Data Usage
 2014-09-04 12:16:20 +00:00
Zoltan Szatmary-Ban
0635a3b9dd am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 
* commit '1e0ea452635fb3e8fbac733567489a38ee3ed635':
  Start activity for the correct user in Settings > Data Usage
 2014-09-04 12:06:15 +00:00
Zoltan Szatmary-Ban
1e0ea45263 Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev 2014-09-04 11:55:49 +00:00
Alexandra Gherghina
ce9692fa70 am b062e329: am 559308d8: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit 'b062e32921fa6f57065ebe185a7da9a22ad8c3f2':
  Code clean-ups following moving the managed profile under accounts
 2014-09-04 09:56:35 +00:00
Alexandra Gherghina
b062e32921 am 559308d8: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit '559308d88c510e636064b366e8cae4bb18dd8757':
  Code clean-ups following moving the managed profile under accounts
 2014-09-04 09:45:51 +00:00
Alexandra Gherghina
559308d88c am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit '9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
  Code clean-ups following moving the managed profile under accounts
 2014-09-04 09:36:02 +00:00
Alexandra Gherghina
9dce0791f8 Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 2014-09-04 09:26:03 +00:00
PauloftheWest
b660ca1e82 am fe98c0b1: am 92d191d0: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 
* commit 'fe98c0b184ce6cdaddcd452747ed1fad1360f191':
  Fixed an issue were "Saved Networks" would not appear correctly.
 2014-09-04 00:16:50 +00:00
Fabrice Di Meglio
a9eb34cc57 am e2b574db: am 06ef6dc9: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 
* commit 'e2b574db64b70ea3404d12d3057b876d32bd1b71':
  Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed
 2014-09-04 00:16:49 +00:00
Fabrice Di Meglio
8fdfb79a65 am 29973a7e: am c4a8a619: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit '29973a7eb515c0987d280728ae790eaf302ac92c':
  Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
 2014-09-04 00:16:49 +00:00
Wink Saville
03d217f329 am 93df88d9: am 9e1b9437: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit '93df88d99819f9a1e3d1c35bb494b17963597be7':
  Prepare to make SubscriptionManager public.
 2014-09-04 00:16:48 +00:00
PauloftheWest
fe98c0b184 am 92d191d0: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 
* commit '92d191d0efec1c9df5ac5f6c34f2158a25beda84':
  Fixed an issue were "Saved Networks" would not appear correctly.
 2014-09-03 23:48:27 +00:00
Fabrice Di Meglio
e2b574db64 am 06ef6dc9: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 
* commit '06ef6dc940ec55c0bdaa1e16a0394235e4e860e5':
  Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed
 2014-09-03 23:47:23 +00:00
Fabrice Di Meglio
29973a7eb5 am c4a8a619: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit 'c4a8a6194cbaf5b9910d855596af52ec11b24e5a':
  Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
 2014-09-03 23:46:36 +00:00
Wink Saville
93df88d998 am 9e1b9437: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit '9e1b9437d44543894f66671ad34d46aa00dec560':
  Prepare to make SubscriptionManager public.
 2014-09-03 23:46:09 +00:00
PauloftheWest
92d191d0ef am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 
* commit '7641e1ad44f6006cac1bd1b88ca09b3bab2cca78':
  Fixed an issue were "Saved Networks" would not appear correctly.
 2014-09-03 22:12:54 +00:00
PauloftheWest
7641e1ad44 Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 2014-09-03 22:00:39 +00:00
Fabrice Di Meglio
06ef6dc940 am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 
* commit '52a48226ec0566570afd6f0d2c5287d9b727b339':
  Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed
 2014-09-03 20:51:26 +00:00
Fabrice Di Meglio
52a48226ec Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 2014-09-03 20:43:55 +00:00
Fabrice Di Meglio
89b170aa05 Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed 
- use the Preference.setSummary(CharSequence) instead of trying to set the summary
manually

Change-Id: I3692c50e3821a34a9c03a614cbc40209157068f3
 2014-09-03 13:40:08 -07:00
Fabrice Di Meglio
c4a8a6194c am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit '815dc2738dcb1fe8abf9e436cae3e217edc77d95':
  Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
 2014-09-03 20:13:11 +00:00
Fabrice Di Meglio
815dc2738d Merge "Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'" into lmp-dev 2014-09-03 20:00:25 +00:00
Fabrice Di Meglio
28c6769c03 Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More' 
- revert to the correct string for the Preference screen title.

Change-Id: I17c58485875e71e5785d5879b60aebcf6c4d454a
 2014-09-03 12:57:25 -07:00
Fabrice Di Meglio
964786eee9 am b9e87f62: am f143bc62: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'b9e87f62dd076ecc164b5efaa1023decbfa40b29':
  Fix bug #17208479 Have Cellular Networks Show up in Data Usage
 2014-09-03 19:25:30 +00:00
Wink Saville
9e1b9437d4 am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit '418346d5cf6c41162031a0731927502f503163a1':
  Prepare to make SubscriptionManager public.
 2014-09-03 19:23:26 +00:00
Wink Saville
418346d5cf Merge "Prepare to make SubscriptionManager public." into lmp-dev 2014-09-03 18:26:02 +00:00
Fabrice Di Meglio
b9e87f62dd am f143bc62: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'f143bc62df42d067db490da3a262029f328fecc5':
  Fix bug #17208479 Have Cellular Networks Show up in Data Usage
 2014-09-03 18:23:53 +00:00
Fabrice Di Meglio
f143bc62df am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'b5caa647e74729e0bcfabe12ca40b30a82dd906a':
  Fix bug #17208479 Have Cellular Networks Show up in Data Usage
 2014-09-03 18:11:41 +00:00
Fabrice Di Meglio
b5caa647e7 Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 2014-09-03 17:56:08 +00:00
Dan Sandler
4928f05e59 am afe7e998: am 148d9428: am b58b5127: Fix links to notification settings activities. 
* commit 'afe7e998b06538acb3d7c090ae2bb585fc8582e2':
  Fix links to notification settings activities.
 2014-09-03 17:55:59 +00:00
Vinit Deshpande
ace9d6baa1 am 621bfb35: am 7b3a67b3: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '621bfb35bad0a738e4e31a161417f3124e4d8892':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 17:41:56 +00:00
Amith Yamasani
ee8fefeddc am 6014b940: am b1de932e: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '6014b940af71bd89814bab69b016eadf30a91d4c':
  Change the location mode before applying restrictions
 2014-09-03 17:41:55 +00:00
Dan Sandler
afe7e998b0 am 148d9428: am b58b5127: Fix links to notification settings activities. 
* commit '148d9428bc4eb5d5d3e818b250c1de52d98f9e68':
  Fix links to notification settings activities.
 2014-09-03 16:29:06 +00:00
Dan Sandler
148d9428bc am b58b5127: Fix links to notification settings activities. 
* commit 'b58b5127040b3c843fe42544a89a1085cf7e74f6':
  Fix links to notification settings activities.
 2014-09-03 16:19:25 +00:00
Dan Sandler
b58b512704 Fix links to notification settings activities. 
Additionally, we now show the user a list of "app-like"
things (packages with launchable activities) instead of only
non-system things. This way you can make (some) changes to
system package notifications while not having to page
through reams of random non-app packages.

Bug: 17277023
Change-Id: I920d6b941070efb75a816e6ad38b798b09a83d08
 2014-09-03 16:37:51 +02:00
Vinit Deshpande
621bfb35ba am 7b3a67b3: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '7b3a67b369a1a444eb4eb9c1424aa82dc2830d45':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 14:33:32 +00:00
Amith Yamasani
6014b940af am b1de932e: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit 'b1de932ec6c5b3d59b8181701b34b5346beda437':
  Change the location mode before applying restrictions
 2014-09-03 14:33:31 +00:00
PauloftheWest
de29d04fae Fixed an issue were "Saved Networks" would not appear correctly. 
Bug: 17284538
Change-Id: Id93cd93f94a59437b04d41d4b0412d3b22575e17
 2014-09-03 05:42:14 -07:00
Alexandra Gherghina
e529bb9841 Code clean-ups following moving the managed profile under accounts 
Bug: 16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
 2014-09-03 11:01:45 +01:00
PauloftheWest
4cef6be766 am ef895ed2: am 5029b7a9: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit 'ef895ed21e8b0b3a9b85b1689e0095a4fa9389e6':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-03 09:12:33 +00:00
Wink Saville
d857104325 Prepare to make SubscriptionManager public. 
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.

Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
 2014-09-02 22:46:42 -07:00
PauloftheWest
ef895ed21e am 5029b7a9: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit '5029b7a90c083d2128d09d34e9d32f1b89a14488':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-03 05:07:29 +00:00
Jason Monk
07cdf23306 am 797f3c48: am 8069392f: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit '797f3c48532fdec5b692342a5554330755ba4778':
  Bring back auto-rotate to settings
 2014-09-03 05:02:54 +00:00
Paul Lawrence
b3710da386 am 23eeb099: am bde3efa0: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit '23eeb0996f343e95fd54b6c317f817dac61da61e':
  Get correct factory reset reason from encryption failure
 2014-09-03 05:02:34 +00:00
Fabrice Di Meglio
14be7d23a2 Fix bug #17208479 Have Cellular Networks Show up in Data Usage 
- prevent collisions in the DocId (which is the primary key of
the FTS4 table)
- instead of just using "updatedTitle" hash, use instead
"updatedTitle + screenTitle"

Change-Id: If38f7bcc7fb857d59242d08c16c39adb80590254
 2014-09-02 18:31:10 -07:00