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

15317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
80f5a84bf0 am d857636e: am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'd857636eec3bbb862a9259130fca569c95de3b72':
  Show managed profile under accounts rather than users
 2014-08-11 09:35:53 +00:00
Alexandra Gherghina
d857636eec am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'bad9e585dde30e6dcd1066bd5045516d79491b43':
  Show managed profile under accounts rather than users
 2014-08-11 09:31:42 +00:00
Alexandra Gherghina
bad9e585dd am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'ad54ba7030be6654bd76b3ee1a001d388130bcac':
  Show managed profile under accounts rather than users
 2014-08-11 09:29:20 +00:00
Alexandra Gherghina
c465b19883 am 27ece31c: am 28034bad: am 59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 
* commit '27ece31c59ae075f8d21efce7030066244c04d9e':
  Fix updating view flow of Account Sync Settings
 2014-08-11 09:05:39 +00:00
Alexandra Gherghina
27ece31c59 am 28034bad: am 59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 
* commit '28034badf70b5d8b46aeb19dbbb45465db7172b0':
  Fix updating view flow of Account Sync Settings
 2014-08-11 09:02:08 +00:00
Alexandra Gherghina
28034badf7 am 59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 
* commit '59f01b9b585c374fadb935fb115b4ad34b100eb4':
  Fix updating view flow of Account Sync Settings
 2014-08-11 08:58:48 +00:00
Barnaby James
a254fd6663 am 536301a6: am 71d48c7d: am 092c62f1: Add voice-only settings activities for airplane mode. 
* commit '536301a69e87af2d970376757172a92a495dc7d2':
  Add voice-only settings activities for airplane mode.
 2014-08-09 20:05:20 +00:00
Barnaby James
536301a69e am 71d48c7d: am 092c62f1: Add voice-only settings activities for airplane mode. 
* commit '71d48c7deee389697247a96895afa2a833b3979e':
  Add voice-only settings activities for airplane mode.
 2014-08-09 20:02:13 +00:00
Barnaby James
71d48c7dee am 092c62f1: Add voice-only settings activities for airplane mode. 
* commit '092c62f1f3811f205c764fcb5b8347ec8fed67e6':
  Add voice-only settings activities for airplane mode.
 2014-08-09 19:57:54 +00:00
Barnaby James
092c62f1f3 Add voice-only settings activities for airplane mode. 
This activity can only be triggered through the Voice Interaction API - e.g. from calling VoiceInterationSession.startVoiceActivity()

Change-Id: I39ac409824693bc82e53d707a1ece2b23a89f3a3
 2014-08-08 21:01:01 -07:00
Paul Lawrence
9ab22ac93d am b1f3a008: am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'b1f3a00884dd1e68e460313b1dbb33fbe3c56ba2':
  Strings for next change
 2014-08-08 23:11:24 +00:00
Paul Lawrence
b1f3a00884 am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'c44274917f0f320d9997e03aae0f1f6249572c2e':
  Strings for next change
 2014-08-08 23:05:00 +00:00
Paul Lawrence
c44274917f am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'f8811a59ffd4fa39997154681d753d3370697b83':
  Strings for next change
 2014-08-08 22:59:36 +00:00
Adam Lesinski
9e4115c101 am d80b52d0: am b6bf2d58: am ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev 
* commit 'd80b52d0acf9a3ac714a214a840b2ba4c5dbc9fa':
  Update to use new UsageStats API
 2014-08-08 22:49:38 +00:00
Adam Lesinski
d80b52d0ac am b6bf2d58: am ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev 
* commit 'b6bf2d584756468ffa666ee618702cb60c1263fe':
  Update to use new UsageStats API
 2014-08-08 22:44:23 +00:00
Adam Lesinski
b6bf2d5847 am ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev 
* commit 'ff72b3ee556e3524e0c5e3218e781a914aa1fa4e':
  Update to use new UsageStats API
 2014-08-08 22:39:52 +00:00
Fabrice Di Meglio
4599b2dec5 am 92987f3a: am 212f1327: am 4fbe967e: Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 
* commit '92987f3a98c2b66eddba66f41d9aea71b7f70cb3':
  Fix bug #16578018 Wi-Fi network list items should be centered with icons
 2014-08-08 21:10:29 +00:00
Fabrice Di Meglio
92987f3a98 am 212f1327: am 4fbe967e: Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 
* commit '212f13274bcce65a22f4c31b04fd5d72b56b3601':
  Fix bug #16578018 Wi-Fi network list items should be centered with icons
 2014-08-08 21:04:58 +00:00
Fabrice Di Meglio
212f13274b am 4fbe967e: Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 
* commit '4fbe967e0f19e04e5ed40cc42c55ec0b5dfc5643':
  Fix bug #16578018 Wi-Fi network list items should be centered with icons
 2014-08-08 21:02:32 +00:00
Alexandra Gherghina
ad54ba7030 Merge "Show managed profile under accounts rather than users" into lmp-dev 2014-08-08 20:34:05 +00:00
Alexandra Gherghina
83adb564de Show managed profile under accounts rather than users 
Also fixes overflow menu to update on remove/add managed profile.

Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
 2014-08-11 10:02:13 +01:00
Fabrice Di Meglio
4fbe967e0f Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 2014-08-08 20:31:22 +00:00
Fabrice Di Meglio
cba834dedf Fix bug #16578018 Wi-Fi network list items should be centered with icons 
- force correct refresh of the Preference summary
- put some non used code into comment ...

Change-Id: I17fc6fe2cf0717bae613d78cfac2c88d3e160ef4
 2014-08-08 13:55:58 -07:00
Fabrice Di Meglio
1e283ab2ec am 60b77e55: am 7aa645e4: am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev 
* commit '60b77e55dc3595dffec93954c1833d82af1c9a08':
  Fix Wi-Fi Assistant padding
 2014-08-08 20:08:45 +00:00
Fabrice Di Meglio
60b77e55dc am 7aa645e4: am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev 
* commit '7aa645e4986468dbc0c8bfa9edea174e82ef97ab':
  Fix Wi-Fi Assistant padding
 2014-08-08 20:04:41 +00:00
Fabrice Di Meglio
7aa645e498 am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev 
* commit '07fd346996c61c47e1dc13648cbbde3090a4b248':
  Fix Wi-Fi Assistant padding
 2014-08-08 20:02:19 +00:00
Fabrice Di Meglio
3efc465cbd am 2c24d14d: am 331c2bf5: am 09076e5f: Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 
* commit '2c24d14d45166caed0720334192ee05a83e8229b':
  Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
 2014-08-08 19:56:35 +00:00
Fabrice Di Meglio
2c24d14d45 am 331c2bf5: am 09076e5f: Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 
* commit '331c2bf5e6bfaa61136d8faa86acfab1b8802cd8':
  Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
 2014-08-08 19:51:11 +00:00
Fabrice Di Meglio
331c2bf5e6 am 09076e5f: Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 
* commit '09076e5f3c90dbc1a3bdf6f000e0c99dd2bb45b4':
  Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
 2014-08-08 19:39:57 +00:00
Alexandra Gherghina
59f01b9b58 Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 2014-08-08 18:15:47 +00:00
Adam Lesinski
ff72b3ee55 Merge "Update to use new UsageStats API" into lmp-dev 2014-08-08 18:15:47 +00:00
Jeff Sharkey
f37dfb733b am 109ec506: am c44e33e1: am dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev 
* commit '109ec50635927c302fa9e292381fb2c79023a78f':
  Avoid NPE when template rapidly switched.
 2014-08-08 17:47:44 +00:00
Jeff Sharkey
109ec50635 am c44e33e1: am dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev 
* commit 'c44e33e1a03a2b5e92db9329981885da35fe0ab8':
  Avoid NPE when template rapidly switched.
 2014-08-08 17:41:54 +00:00
PauloftheWest
f87e196918 am f1103f73: am fc5a4085: am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit 'f1103f73f47be9228b8b61806f945a4d2b953503':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:39:18 +00:00
Alexandra Gherghina
4d6e46a399 am 589766aa: am eecdb636: am e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 
* commit '589766aa8ca234867edd9ac2a914e793b330b013':
  Open the same tab when switching profiles in apps settings
 2014-08-08 17:39:17 +00:00
Jeff Sharkey
c44e33e1a0 am dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev 
* commit 'dc16286ff32dfc4d087938461d0beca29b6167a3':
  Avoid NPE when template rapidly switched.
 2014-08-08 17:37:16 +00:00
PauloftheWest
f1103f73f4 am fc5a4085: am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit 'fc5a4085e14957458677f10b1b69f15494df5794':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:31:37 +00:00
Alexandra Gherghina
589766aa8c am eecdb636: am e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 
* commit 'eecdb636b02d9c4c9280be9e6bf40849c2209ecd':
  Open the same tab when switching profiles in apps settings
 2014-08-08 17:31:31 +00:00
Fabrice Di Meglio
09076e5f3c Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 2014-08-08 17:26:08 +00:00
Fabrice Di Meglio
22a2a49b44 Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots 
- add the proper SearchIndexProvider to SimSettings
- allow indexing only an only if showSimCardTile() is true
- add Utils.showSimCardTile()

Change-Id: I5df2284d32f91fa454e1edebf1139d00593138a0
 2014-08-08 12:33:21 -07:00
PauloftheWest
fc5a4085e1 am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit '14f60296574316f94ca03fb82fc3675db373734e':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:24:12 +00:00
Alexandra Gherghina
eecdb636b0 am e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 
* commit 'e54014c4bbabfa3307e51253308263da0844537b':
  Open the same tab when switching profiles in apps settings
 2014-08-08 17:24:11 +00:00
Alexandra Gherghina
d4353db21c Fix updating view flow of Account Sync Settings 
Bug: 16785070 Account sync settings page doesn't refresh after removing account
Change-Id: Iddbe9d73f4d6fcb55829f8bb6ab2fe6ffa147cf3
 2014-08-08 18:14:34 +01:00
Dan Sandler
e7292d07b1 am c6b71394: am f27ee3c6: am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev 
* commit 'c6b71394ae0380d97e1b312f34f4214e32a5a750':
  Fully deprecate Power Control widget.
 2014-08-08 13:07:09 +00:00
Dan Sandler
c6b71394ae am f27ee3c6: am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev 
* commit 'f27ee3c6e2929f537575ff18cc5ceaf88ca2bbdb':
  Fully deprecate Power Control widget.
 2014-08-08 13:04:15 +00:00
Dan Sandler
f27ee3c6e2 am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev 
* commit 'b5fca45768d36552ce74785dfbc9d7da7ce67bea':
  Fully deprecate Power Control widget.
 2014-08-08 12:59:34 +00:00
Adam Lesinski
1789f7d236 Update to use new UsageStats API 
Change-Id: Ic6f9523c4c70f8b832d8f57551417f4f19ea144f
 2014-08-07 21:30:52 -07:00
Jim Miller
4e9aa5e905 am 87b7cc1a: am 5ff26209: am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev 
* commit '87b7cc1a26b295b64955a0899a7088c981f17edb':
  Don't show TrustAgent entries when no security is enabled.
 2014-08-08 02:27:14 +00:00
PauloftheWest
55255645a9 am 87453273: am e30ced00: am b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 
* commit '874532737336e9ff2a460424385a98cee4c9c127':
  Removed infinite loop in Multi-Sim Settings.
 2014-08-08 02:27:13 +00:00
Kenny Guy
41e9007e13 am a68b9d7b: am db3b7e4a: am 39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev 
* commit 'a68b9d7b633843a3cbf6a15a8dccec24d8f89abc':
  Move over to CharSequence version of badging method.
 2014-08-08 02:27:12 +00:00