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

15905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zoltan Szatmary-Ban
d58f0bd64f Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 2014-08-08 20:34:05 +00:00
Zoltan Szatmary-Ban
a1373770c1 Increase CHAR_LIMIT on Device Admins Settings message 
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.

Bug:16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
 2014-08-11 11:50:39 +01: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
Dianne Hackborn
fe23d48640 am 9728284f: am 02f8ee9a: am 537a0a82: Fix issue #16555033: Battery history overflowing too much 
* commit '9728284f23c7963a81487b318adc4e6f192ea527':
  Fix issue #16555033: Battery history overflowing too much
 2014-08-08 02:27:10 +00:00
PauloftheWest
0fa724c0a1 am 327b6661: am 5380f196: am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog. 
* commit '327b66619a1be472b4051ad8e5101a1551fa718e':
  Changed a Bluetooth device's settings from an activity to a dialog.
 2014-08-08 02:27:08 +00:00
Jim Miller
87b7cc1a26 am 5ff26209: am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev 
* commit '5ff2620928084f1e206341bcf62d08b581c8cff5':
  Don't show TrustAgent entries when no security is enabled.
 2014-08-08 00:57:11 +00:00
PauloftheWest
8745327373 am e30ced00: am b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 
* commit 'e30ced00160e66a51caa9605fd70e93400ffda0a':
  Removed infinite loop in Multi-Sim Settings.
 2014-08-08 00:56:36 +00:00
Kenny Guy
a68b9d7b63 am db3b7e4a: am 39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev 
* commit 'db3b7e4a600b6ec0b0c553609dde27d492b76f4d':
  Move over to CharSequence version of badging method.
 2014-08-08 00:55:44 +00:00
Dianne Hackborn
9728284f23 am 02f8ee9a: am 537a0a82: Fix issue #16555033: Battery history overflowing too much 
* commit '02f8ee9a056a9f9144c3a150c1e65ba6be478b8a':
  Fix issue #16555033: Battery history overflowing too much
 2014-08-08 00:55:33 +00:00
PauloftheWest
327b66619a am 5380f196: am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog. 
* commit '5380f196a2495a6ebc56fd321bb1b690f604e45e':
  Changed a Bluetooth device's settings from an activity to a dialog.
 2014-08-08 00:53:31 +00:00
Jim Miller
5ff2620928 am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev 
* commit '6cd90f45b7fb7324eef9d05ae38e0e26bfc934d5':
  Don't show TrustAgent entries when no security is enabled.
 2014-08-07 22:29:33 +00:00
PauloftheWest
e30ced0016 am b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 
* commit 'b0a97a52dffa5ea3520cb2ff58681c2782b53160':
  Removed infinite loop in Multi-Sim Settings.
 2014-08-07 22:00:50 +00:00
Kenny Guy
db3b7e4a60 am 39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev 
* commit '39a371631370cd6f150d2d67d73e2d96da7a5e18':
  Move over to CharSequence version of badging method.
 2014-08-07 21:08:24 +00:00
Dianne Hackborn
02f8ee9a05 am 537a0a82: Fix issue #16555033: Battery history overflowing too much 
* commit '537a0a82351d9671d14dccde8c9fc2a45c3c4f3a':
  Fix issue #16555033: Battery history overflowing too much
 2014-08-07 21:04:22 +00:00
Dianne Hackborn
537a0a8235 Fix issue #16555033: Battery history overflowing too much 
Use new mechanism to retrieve battery stats, now that they
can be much larger.

Make sure these will ever end up going through an IPC.

Change-Id: Ic582a61d736e24bddc905082c1565ece00fcbb29
 2014-08-07 12:19:48 -07:00