PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,799 Commits 1 Branch 0 Tags
db3b7e4a600b6ec0b0c553609dde27d492b76f4d
Commit Graph

14799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kenny Guy
39a3716313 Merge "Move over to CharSequence version of badging method." into lmp-dev 2014-08-07 18:53:12 +00:00
Kenny Guy
cc2cbaf421 Move over to CharSequence version of badging method. 
Bug: 16484455
Change-Id: Ie5ee010efc439219cb71fd4241fdb798a5f4ea12
 2014-08-07 22:01:22 +01:00
PauloftheWest
5380f196a2 am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog. 
* commit '689d2ce29b3093c32d1d2b70caa6fb36a4ecefcb':
  Changed a Bluetooth device's settings from an activity to a dialog.
 2014-08-07 18:40:34 +00:00
PauloftheWest
689d2ce29b Changed a Bluetooth device's settings from an activity to a dialog. 
+ Replace the “Paired bluetooth device” screen with a “Pair device” dialog
+ Add device name text field at the top
+ Replace “Unpair” list item with a “Forget" button at bottom of dialog
+ Change “Profiles” section header to “Use for”
+ Remove status under profile titles
+ Move checkboxes to left side of labels

Bug: 15719219
Change-Id: I3b0e8c82c761fae98f16508b9fd9c58aff651f80
 2014-08-07 11:31:25 -07:00
Andres Morales
2d4b3e6baf am ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev 
* commit 'ff150032e3c369513b0ba85b09aff1d8933c7ad3':
  Don't wipe PST partition if OEM unlock is enabled
 2014-08-07 17:36:51 +00:00
Andres Morales
3847658958 am b1e7688a: Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 
* commit 'b1e7688aef258a4cd832b363ff7db632baabd13b':
  Prevent newlines and long captions selecting default payment app
 2014-08-07 17:13:23 +00:00
Zoltan Szatmary-Ban
50946be416 am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 
* commit 'ec08228ea9a3713fbfac05fe211fc931992788a2':
  Badge texts correctly for accessibility in Settings
 2014-08-07 13:41:42 +00:00
Sander Alewijnse
6173fed5a9 am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev 
* commit '6a39bc68aea91483804d2ab8635159803208095d':
  Prevent launcher switching in Settings app.
 2014-08-07 11:57:49 +00:00
Andres Morales
ff150032e3 Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev 2014-08-06 23:49:20 +00:00
Andres Morales
ae58323a6b Don't wipe PST partition if OEM unlock is enabled 
This will be wiped by the recovery system and the OEM
unlock bit will be retained.

Bug: 16631974
Change-Id: I65522dd93c8465ff7f7ecbcef404bff6e9c864d6
 2014-08-07 00:03:31 +00:00
Andres Morales
b1e7688aef Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 2014-08-06 23:49:20 +00:00
Andres Morales
78ce5e8c9f Prevent newlines and long captions selecting default payment app 
This would allow attackers to spoof the default selection
dialog causing the user to unkowingly change their default
payment handler.

Bug: 15906632
Change-Id: I49ad2a7351bd6d2c1f9a79ad9be0cbc9787ca6c3
 2014-08-07 00:45:03 +00:00
Amith Yamasani
23f8ea97ee am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev 
* commit 'f34c3501948190acf44defefba8eb161ec6dc07b':
  Fix removal of optional settings tiles
 2014-08-06 23:21:29 +00:00
Geoff Mendal
8116ff6506 am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a0b87a2436c95777dcb3b3a14660105aa63d0b80':
  Import translations. DO NOT MERGE
 2014-08-06 19:50:48 +00:00
Fabrice Di Meglio
6d327ca8d1 am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 
* commit 'fa8950be33c777d0305775ee3a364300d454f91b':
  Fix bug #16800261 Settings app: Device administrator screen padding issue
 2014-08-06 19:07:31 +00:00
Dan Sandler
c242bf375b am bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 
* commit 'bac0fc1f6b448c41f9f3889cba2b93c718dc1788':
  Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-08-06 18:05:45 +00:00
Dan Sandler
0ed917098e am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '4bdf8b498bf588f42368faf822f757fcd97a7959':
  Replace missing resource.
 2014-08-06 18:01:41 +00:00
Fabrice Di Meglio
911a54df7d am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit 'bce84e798bbfbb9fd576cb785d90bf69cb3843e0':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:01:40 +00:00
Fabrice Di Meglio
fa8950be33 Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
06601e149e Fix bug #16800261 Settings app: Device administrator screen padding issue 
- remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from
the ListView and add it to the list item
- add missing 8dp end padding for the icon

Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
 2014-08-06 11:25:39 -07:00
Fabrice Di Meglio
bce84e798b Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
df77106e94 Fix bug #16712121 Add 'Experimental' substring to 'High contrast text' 
- add "(Experimental)" as a summary text for "High contrast text"

Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
 2014-08-06 10:55:39 -07:00
Alexandra Gherghina
a456d88664 am 1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev 
* commit '1fcd7faad666cfb56553c7313723a5c6fc8df3cb':
  Clears previously added cross-profile-intents
 2014-08-06 13:45:43 +00:00
Dianne Hackborn
b8e0e338c4 am dc77335e: Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 
* commit 'dc77335eda0edee8e8a72d04155aacad91ddc12c':
  Fix issue #16537318: clarify voice interaction strings.
 2014-08-06 01:13:15 +00:00
Svet Ganov
4f60e48110 am c15c0c07: Add support for widgets in user profiles 
* commit 'c15c0c078e65dfd8c10cf646fcd556cc26a6f62d':
  Add support for widgets in user profiles
 2014-08-05 22:25:06 +00:00
Svet Ganov
c15c0c078e Add support for widgets in user profiles 
bug:14991269

Change-Id: I7f71787bf5e5278230063b9d3bafac96a0680682
 2014-08-05 15:21:25 -07:00
Adrian Roos
774b4a626a am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 
* commit '1f4049edfe1937ce19c7d93a5576ea03db83ad50':
  Ask about redacted notifications after setting up a secure lock
 2014-08-05 19:12:22 +00:00
John Spurlock
511cdef85d am 802ddf99: Settings: New application-level notification settings. 
* commit '802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe':
  Settings: New application-level notification settings.
 2014-08-05 15:13:07 +00:00
John Spurlock
802ddf99f5 Settings: New application-level notification settings. 
- Convert the old application-level dialog to an activity.
 - Move the settings icon to the new activity (out of the list).
 - Add a custom application header, similar to the switch bar style.
 - Use the ubiquitous vector gear for the settings icon.
 - Migrate old checkboxes to switch prefs, add new summaries.
 - Remove obsolete artifacts.

Bug:16396715
Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
 2014-08-05 11:08:03 -04:00
Geoff Mendal
434220e93c am f3dfd182: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f3dfd182e17c91ae4cd9e40a96308b83fdaefb49':
  Import translations. DO NOT MERGE
 2014-08-05 01:03:22 +00:00
Dan Sandler
bac0fc1f6b Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 2014-08-05 00:35:13 +00:00
Dan Sandler
3e2afb6ef7 Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS. 
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
 2014-08-06 13:53:25 -04:00
Dan Sandler
a15e76d113 Replace missing resource. 
Bug: 16833578
Change-Id: I9ad1dc992577f6bfdc9d1201b6c13591a32f3fc8
 2014-08-06 13:53:25 -04:00
Dan Sandler
4bdf8b498b Merge "Replace missing resource." into lmp-dev 2014-08-05 00:35:13 +00:00
Adrian Roos
1f4049edfe Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 2014-08-05 00:35:13 +00:00
Adrian Roos
6f60f7ed22 Ask about redacted notifications after setting up a secure lock 
Bug: 14437890
Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
 2014-08-05 20:54:47 +02:00
Geoff Mendal
f3dfd182e1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-05 00:34:22 +00:00
Geoff Mendal
c47db9c9fa Import translations. DO NOT MERGE 
Change-Id: If24e248354ae999208643fb8f91b0c0a9e7de233
Auto-generated-cl: translation import
 2014-08-04 17:35:58 -07:00
Geoff Mendal
a0b87a2436 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-05 00:29:22 +00:00
Geoff Mendal
8e89e6d644 Import translations. DO NOT MERGE 
Change-Id: I9d45348a4c9fab36e1c23ddf01b3c5c2cb535f56
Auto-generated-cl: translation import
 2014-08-06 12:23:02 -07:00
Zoltan Szatmary-Ban
ec08228ea9 Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 2014-08-05 00:19:02 +00:00
Zoltan Szatmary-Ban
ebb36ec920 Badge texts correctly for accessibility in Settings 
If an app is a managed profile's app then its label should read correctly by TalkBack.
Affected screens: Data Usage, Location, Battery.

Bug:16053981
Change-Id: I393c0ebf56917032d619b1e39b4bf141ee236981
 2014-08-07 14:15:14 +01:00
Sander Alewijnse
6a39bc68ae Merge "Prevent launcher switching in Settings app." into lmp-dev 2014-08-05 00:19:02 +00:00
Sander Alewijnse
cd40220372 Prevent launcher switching in Settings app. 
User won't be able to switch to launchers that do not support
managed profiles.
Additional explanation is shown in text under the name of the
launcher.

Bug:15099904

Change-Id: I12470bf396d41ef47d463ef42835964aacda9719
 2014-08-07 12:48:22 +01:00
Amith Yamasani
f34c350194 Merge "Fix removal of optional settings tiles" into lmp-dev 2014-08-05 00:19:02 +00:00
Amith Yamasani
57fd5fd84b Fix removal of optional settings tiles 
Bug: 16654819

Fix the way the tiles get removed so the index is not out of sync
and there's no double deletion of entries.

Change-Id: I18da6b633884f51418c11afb0e177b49ca085fd0
 2014-08-06 15:48:10 -07:00
Alexandra Gherghina
1fcd7faad6 Merge "Clears previously added cross-profile-intents" into lmp-dev 2014-08-05 00:15:52 +00:00