Alan Viverette
40b55b1d33
Merge "Fix switch bar theme, clean up text appearances"
2015-03-27 23:16:15 +00:00
Geoff Mendal
1e63f8434c
Import translations. DO NOT MERGE
...
Change-Id: Ic235d2ba6215cbcf6850d8e7fab2a405311b7d32
Auto-generated-cl: translation import
2015-03-27 15:14:21 -07:00
Lifu Tang
a369820002
Merge "Made scanning settings searchable"
2015-03-27 19:51:46 +00:00
Lifu Tang
ff6d4894e8
Made scanning settings searchable
...
Bug: 19965598
Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
2015-03-27 12:39:40 -07:00
Chris Wren
8a963babe2
log visibility of views
...
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
2015-03-27 13:39:07 -04:00
Alan Viverette
fd05a78a03
Fix switch bar theme, clean up text appearances
...
Change-Id: Ica2577ecfce61270bc38ea4a22d37f7e37f0b1bc
2015-03-27 10:23:45 -07:00
Jason Sams
096abbf56a
am 57f132d0
: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
...
* commit '57f132d0862369899e937664c45f35e220db4cf7':
2015-03-27 02:01:05 +00:00
Stuart Scott
58bf2e41a2
am 1730be6f
: am 7b6bd4d8
: am 6b08e11e
: am 53eec9fa
: Fix sim notifications.
...
* commit '1730be6f29771cb1bfa25dae66e1f508b30fbef9':
2015-03-27 02:01:02 +00:00
Jason Sams
57f132d086
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
2015-03-27 01:24:58 +00:00
Stuart Scott
1730be6f29
am 7b6bd4d8
: am 6b08e11e
: am 53eec9fa
: Fix sim notifications.
...
* commit '7b6bd4d8c5c59663468ef0e17e8ebf31fd63c06d':
2015-03-27 01:10:27 +00:00
Stuart Scott
7b6bd4d8c5
am 6b08e11e
: am 53eec9fa
: Fix sim notifications.
...
* commit '6b08e11ef979cd8eb47d91be262c08fc3813bd7f':
2015-03-27 00:50:43 +00:00
Stuart Scott
6b08e11ef9
am 53eec9fa
: Fix sim notifications.
...
* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
2015-03-27 00:34:46 +00:00
Jason Monk
390910b333
Merge "Fix managed profile bugs in manage apps list"
2015-03-26 12:40:44 +00:00
Jason Monk
1f4f30cd06
Fix managed profile bugs in manage apps list
...
- Uses the same package manager flags as secondary users for managed
profiles, so that owner apps don't show up.
- Fixes bug in getting AppEntries that caused app info for profile
apps to get the owner one instead (which was unbadged and very
broken).
Bug: 19817357
Change-Id: I659ab1081c68a231330f5b16486abc5a0a5b2029
2015-03-26 08:35:02 -04:00
Stuart Scott
ce3bf6bacb
Merge "Dont access PhoneFactory, as it could have been inited in another JVM."
2015-03-25 22:27:52 +00:00
Stuart Scott
5ff4e0bc9d
am f6432118
: am 4a682e56
: am c28e80b8
: am 53eec9fa
: Fix sim notifications.
...
* commit 'f64321184cbe64ab010ffd2fde9bbd543bec9299':
Fix sim notifications.
2015-03-25 22:13:51 +00:00
Stuart Scott
f64321184c
am 4a682e56
: am c28e80b8
: am 53eec9fa
: Fix sim notifications.
...
* commit '4a682e56c80435e1f3ce7bc8ae848337a2426fc3':
Fix sim notifications.
2015-03-25 22:04:59 +00:00
Stuart Scott
4a682e56c8
am c28e80b8
: am 53eec9fa
: Fix sim notifications.
...
* commit 'c28e80b8fb1a4fd6d326bbb79547f3597cf0412f':
Fix sim notifications.
2015-03-25 20:34:04 +00:00
Prerepa Viswanadham
9d2ebc3cf0
Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java"
2015-03-25 19:59:48 +00:00
Stuart Scott
c28e80b8fb
am 53eec9fa
: Fix sim notifications.
...
* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
2015-03-25 19:48:23 +00:00
Jim Miller
85d9e16cc1
Merge "Update Settings to use new fingerprint API"
2015-03-25 19:46:02 +00:00
Jason Monk
c735941a85
Merge "Allow system apps to add to settings dashboard"
2015-03-25 19:34:45 +00:00
Stuart Scott
53eec9faad
Fix sim notifications.
...
bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
2015-03-25 18:07:45 +00:00
Jason Monk
ae194b749a
Merge "Add running services screen to developer options"
2015-03-25 16:31:14 +00:00
Jason Monk
5dc70b1085
Add running services screen to developer options
...
This used to live under manage apps, but does no longer.
Bug: 19926589
Change-Id: I2554f14205286cc38fc87779873c37a5a1f80c4e
2015-03-25 15:27:09 +00:00
Jason Monk
2ebc8a0169
Allow system apps to add to settings dashboard
...
Allow system apps to add a tile to the top level of settings that
links to an activity through adding a filter for a specific action.
Determine the info for the tile based off manifest info for the
activity. Also allow the same for managed profiles, but show a dialog
in between to select which profile.
The category in which the item is to be placed must be in meta-data.
The icon and title can be specified through meta-data as well or
if unspecified the activity's label and icon will be used.
Also added an optional <external-tiles> tag to the dashboard
category xml, this allows Settings to put external tiles
in the middle of some categories (Personal does this).
Bug: 19443117
Change-Id: Idc9938d1549d181103a3030a8784b527215a8399
2015-03-25 11:11:36 -04:00
Geoff Mendal
5528d8952b
Import translations. DO NOT MERGE
...
Change-Id: I8c6e884fd6411845209ce454d98fdb653a1d6158
Auto-generated-cl: translation import
2015-03-25 08:10:44 -05:00
Svet Ganov
79021c27c9
Lauch manage permissions UI from settings
...
Change-Id: I96f75ebfb4c3984b7e93abf1de41963aa67d4cbd
2015-03-24 20:17:08 -07:00
Prerepa Viswanadham
77eb8880e8
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
...
Fix build in DevelopmentSettings.java
Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
2015-03-24 19:08:43 -07:00
Lifu Tang
2a837190a9
Merge "Added a screen to configure wireless scanning"
2015-03-24 23:48:07 +00:00
Jim Miller
d16c9b7c31
Update Settings to use new fingerprint API
...
Bug 16487912
Change-Id: I99ac78f476d43f6b87f5dd20e597c51ed08d2c0e
2015-03-24 16:02:59 -07:00
Geoff Mendal
a450479285
am d7d1f521
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'd7d1f521a969a783aaf8b9a681b1a9282f5c3224':
Import translations. DO NOT MERGE
2015-03-24 01:33:12 +00:00
Geoff Mendal
3ed127a404
am 4708550a
: (-s ours) am 674d1d6b
: (-s ours) am 47d342c3
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4708550ab413d0120cfe0d93daf6f200e49be625':
Import translations. DO NOT MERGE
2015-03-24 01:33:06 +00:00
Stuart Scott
97771a3b79
Dont access PhoneFactory, as it could have been inited in another JVM.
...
bug:19858201
Change-Id: I1684c473407b530d23a8965df3ff9a5353803397
2015-03-23 17:53:39 -07:00
Jim Miller
6fc737cc77
Merge "Fix type-o in fingerprint dialog text"
2015-03-24 00:27:58 +00:00
Geoff Mendal
9f7b357891
am 18367b64
: (-s ours) am 4b52bfbb
: (-s ours) am d20acfeb
: (-s ours) Import translations. DO NOT MERGE
...
* commit '18367b648b977bf52918bb508a0f628953cfcf6e':
Import translations. DO NOT MERGE
2015-03-23 23:24:12 +00:00
Jim Miller
8a7dea5620
Fix type-o in fingerprint dialog text
...
Fixes bug 19890194
Change-Id: Id24f3baf6a0105348f4f0e205977191d72bfe132
2015-03-23 16:17:54 -07:00
Lifu Tang
cb193d55e1
Added a screen to configure wireless scanning
...
- Created "Scanning" preference screen
- Added overflow menu on "Location" settings to access "Scanning" settings
- Moved "Wi-Fi scanning always available" from Wi-Fi settings to "Scanning"
settings
- Added "Bluetooth scanning always available" preference (UI only)
Change-Id: I85d8cd60ab309db5db9caee43f4b5a117192d904
2015-03-23 15:55:10 -07:00
Geoff Mendal
4bdd6dff69
am 3cae91d7
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3cae91d701bade99379b0b681ed16ec736603253':
Import translations. DO NOT MERGE
2015-03-23 22:28:16 +00:00
Jason Monk
584b2b2bc1
Make notifications app list use new manage apps
...
The designs for Settings have the notification app list using the
same UI as the Manage Apps list, so switch the notification app
list over to the ManageApplications fragment. This involves
adding some notification based filters and connecting the data
from the Notification Backend to ApplicationsState.
Bug: 19443900
Change-Id: I5e5cdb16890d536613ee59292b89a89b6fb9e2e6
2015-03-23 14:03:04 -04:00
Jason Monk
becc984a47
Merge "Implement new Manage Apps list"
2015-03-23 15:25:07 +00:00
Jason Monk
5b3aa36e6f
Implement new Manage Apps list
...
Manage apps now only has one list. When entered from the dashboard
it is not sortable or filterable, and shows a combination of downloaded
apps and anything that shows up in launcher. When 'all apps' is
entered through advanced app settings, the list shows all apps and
can be filtered and sorted.
Bug: 19443900
Change-Id: I555ee56417c330424d458750b6f81d3bd543f66d
2015-03-23 11:17:07 -04:00
Geoff Mendal
365e0b7c70
Import translations. DO NOT MERGE
...
Change-Id: Ic9bff064e76901057d2255ace54f727b24e01030
Auto-generated-cl: translation import
2015-03-23 08:45:20 -05:00
Geoff Mendal
d7d1f521a9
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-03-23 13:02:40 +00:00
Geoff Mendal
4708550ab4
am 674d1d6b
: (-s ours) am 47d342c3
: (-s ours) Import translations. DO NOT MERGE
...
* commit '674d1d6be522defb7934c9e66e439ed99e827bc4':
Import translations. DO NOT MERGE
2015-03-23 12:55:53 +00:00
Geoff Mendal
674d1d6be5
am 47d342c3
: (-s ours) Import translations. DO NOT MERGE
...
* commit '47d342c371683ca1c02ad709f4eed27541cb8e5f':
Import translations. DO NOT MERGE
2015-03-23 12:49:40 +00:00
Geoff Mendal
e084814474
Import translations. DO NOT MERGE
...
Change-Id: I40cd8ee6c6901d97827a93e1f6fa33a8a4cfe4db
Auto-generated-cl: translation import
2015-03-23 07:46:37 -05:00
Geoff Mendal
47d342c371
Import translations. DO NOT MERGE
...
Change-Id: I136df854ba22b1b72b4c0a4a644202838285e8c4
Auto-generated-cl: translation import
2015-03-23 07:35:10 -05:00
Geoff Mendal
18367b648b
am 4b52bfbb
: (-s ours) am d20acfeb
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4b52bfbbfa39092ca4299f7f29eaa08be359ac91':
Import translations. DO NOT MERGE
2015-03-21 17:08:16 +00:00
Geoff Mendal
4b52bfbbfa
am d20acfeb
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd20acfeb3fbeb9ea54bf049a0e8fe66ef0f64f22':
Import translations. DO NOT MERGE
2015-03-21 16:20:55 +00:00