drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,664 Commits 1 Branch 0 Tags
Commit Graph

481 Commits

Author SHA1 Message Date
Bill Yi
2373132065 Import translations. DO NOT MERGE 
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
 2016-06-08 22:27:34 -07:00
Jason Monk
27eadb6f1d Merge "Settings: Better handling for disabled tiles" into nyc-dev 2016-06-08 19:10:10 +00:00
Ricky Wai
18c8690b7e Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev 2016-06-08 14:33:56 +00:00
Jason Monk
fcad09a777 Settings: Better handling for disabled tiles 
Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.

Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209
 2016-06-08 09:09:06 -04:00
Baligh Uddin
460b95639e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21
 2016-06-07 20:49:52 -07:00
Ricky Wai
b87b0edfb3 Make Settings->Apps can handle work apps even work profile not enabled yet 
Bug: 29090660
Change-Id: I74f79a4939fac16a09c7991181dc25e1ba4e5edc
 2016-06-07 14:52:11 +00:00
Bill Yi
f0807602e7 Import translations. DO NOT MERGE 
Change-Id: I439834e3adbbd35aa0094caaf66776cf03e84276
Auto-generated-cl: translation import
 2016-06-06 18:38:01 -07:00
TreeHugger Robot
93bc210b3f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:53:28 +00:00
TreeHugger Robot
5548733eb5 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 2016-06-03 17:02:53 +00:00
Bill Yi
29e1099f93 Import translations. DO NOT MERGE 
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
 2016-06-03 09:16:16 -07:00
Sudheer Shanka
54cb63c182 Avoid triggering support dialog in non-current user. 
Bug: 28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
 2016-06-03 08:26:04 -07:00
Ian Rogers
3e4885d333 Fix call to equals that could never succeed. 
Caught by Error Prone.
Bug: 29045331

Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit edf2f5747b9adc3399b59eb478c94641b1021222)
 2016-06-01 16:27:28 +00:00
Bill Yi
2f263ac711 Import translations. DO NOT MERGE 
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
 2016-06-01 06:09:15 -07:00
Bill Yi
650a11a2dd Import translations. DO NOT MERGE 
Change-Id: Idaa6156bb45c7c8c23f7b9b66910bcbf7a774ab1
Auto-generated-cl: translation import
 2016-05-30 11:53:22 -07:00
TreeHugger Robot
9aed8c2fa0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 17:07:55 +00:00
Julia Reynolds
3aa969f68d Importance slider updates. 
Icon & tint.

Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
 2016-05-26 11:07:49 -04:00
Bill Yi
3a97b5e245 Import translations. DO NOT MERGE 
Change-Id: I1565d077d00cddf65bcda9034194a020a1a61e7d
Auto-generated-cl: translation import
 2016-05-25 15:53:43 -07:00
Jason Monk
14abed66d7 Merge "Make battery labels translatable." into nyc-dev 2016-05-23 19:58:49 +00:00
Jason Monk
b8d6fcb552 Make battery labels translatable. 
Bug: 28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc
 2016-05-23 14:42:23 -04:00
Bill Yi
ea28bc9461 Import translations. DO NOT MERGE 
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
 2016-05-23 06:21:44 -07:00
Baligh Uddin
f61b6ae1b4 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: If486d4168089e018bea1f2acbdbccb2846ee9250
 2016-05-21 12:39:28 -07:00
Sanket Agarwal
090bf55130 While turning OFF do not honor ON requests. 
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.

This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.

Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
 2016-05-19 18:27:27 +00:00
Baligh Uddin
aebe22dbc3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 18:56:45 +00:00
Sudheer Shanka
93f8fd714a Update RestrictedLockUtils to use UM.getUserRestrictionSource. 
Bug: 28269827
Change-Id: Ib4a1441b71986ca6637a9236136b60e18dbc1643
 2016-05-17 13:27:27 -07:00
Baligh Uddin
b07399fd73 Import translations. DO NOT MERGE 
Change-Id: I6803d5388c5e4c7fa188d908f35962170c4da1dc
Auto-generated-cl: translation import
 2016-05-16 23:23:56 -07:00
Sudheer Shanka
f7a2afb4fc Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev 2016-05-11 19:04:20 +00:00
Torne (Richard Coles)
d3831179c8 Change webview developer setting string. 
Request from UI to change string to make it clearer.

Bug: 28691051
Change-Id: Ibc2507a0e278994741c43fdadccbbe3e416b2e49
 2016-05-11 15:52:07 +01:00
Svetoslav Ganov
7e01af4243 Don't throw runtime exceptions for permission flags 
We were thrwing undocumented runtime exception when
one gets the permission flags - now we just return
default result of the package is gone.

bug:28657926

Change-Id: I42554a86b9304ff83fe9385f3eea930b8ebf0c63
 2016-05-10 15:34:36 +00:00
Bill Yi
1d51db6ba8 Import translations. DO NOT MERGE 
Change-Id: Ia3e265610e5f562a0acfe849e2c7473f2bd44594
Auto-generated-cl: translation import
 2016-05-09 06:14:28 -07:00
Bill Yi
3b4672d8ae Import translations. DO NOT MERGE 
Change-Id: I15055663e1705ae0e64ca3f4242bbad3748461e4
Auto-generated-cl: translation import
 2016-05-05 21:28:01 -07:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings 
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
 2016-05-04 09:33:08 +00:00
Baligh Uddin
da521ddc53 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I15a9ed4cab9b212c20a05b7fddcb00d74c3172bc
 2016-05-03 16:30:12 -07:00
Julia Reynolds
6af7c23168 Merge "Announce access point changes." into nyc-dev 2016-05-03 18:58:13 +00:00
Julia Reynolds
7ed62eb7a2 Announce access point changes. 
Bug: 24202851
Change-Id: I0de0d9bf89191750694a7ba2fac4a95babe62aeb
 2016-05-03 14:54:47 -04:00
Baligh Uddin
0a2893210d Import translations. DO NOT MERGE 
Change-Id: Ia0caec71caaacee083296ac8f093f2c046eaf2a4
Auto-generated-cl: translation import
 2016-05-03 01:16:24 -07:00
Clara Bayarri
88545ce446 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev 2016-04-29 16:38:14 +00:00
Clara Bayarri
962694db38 Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it 
Bug: 28197210
Change-Id: I798a891b1de9777f652a46c1d938e23c0c62f783
 2016-04-29 16:56:02 +01:00
Lorenzo Colitti
fb628c078c The legacy DHCP client is gone. Delete the settings. 
Bug: 27192644
Change-Id: I5bc23f3e269e17d50fa2531a57fb0e2049ae18bf
 2016-04-29 22:19:23 +09:00
Sudheer Shanka
a2650a958b Move spinner_dropdown_restricted_item to Settings. 
RestrictedDropdownPreference is in Settings and currently not
used by anything else, so corresponding layout
spinner_dropdown_restricted_item to Settings.

Bug: 28390118
Change-Id: I3a1b53dc80ba9329d6ffd40562db0c0587a34666
 2016-04-28 14:24:04 -07:00
Bill Yi
119fe56bc7 Import translations. DO NOT MERGE 
Change-Id: I462f55a9c48e4154ce97bbe76b2b8ef6add73086
Auto-generated-cl: translation import
 2016-04-26 22:23:19 -07:00
Bill Yi
6e2d20b2b6 Import translations. DO NOT MERGE 
Change-Id: I1811b4ca04bc4386f233bc1bdc2b486e6ce48b01
Auto-generated-cl: translation import
 2016-04-24 22:31:19 -07:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Keith Cheung
39066abb59 Merge "Include work app in battery optimization settings" into nyc-dev 2016-04-21 15:18:08 +00:00
Mitchell Wills
de629c7ac7 Update scan and last network info in the WorkThread am: cf0875a am: c441faa 
am: 2dbac6c

* commit '2dbac6cee58c343682ebf6590ae170c2acd067e4':
  Update scan and last network info in the WorkThread

Change-Id: I1068111b96b907f9f3c839fc497e9d06e1254d26
 2016-04-20 19:01:51 +00:00
Mitchell Wills
2dbac6cee5 Update scan and last network info in the WorkThread am: cf0875a 
am: c441faa

* commit 'c441faa6de5618e9da029858ce83b3e129be2974':
  Update scan and last network info in the WorkThread

Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
 2016-04-20 18:57:29 +00:00
Mitchell Wills
c441faa6de Update scan and last network info in the WorkThread 
am: cf0875a

* commit 'cf0875a9b69da9da5e16563eca33609e775d9195':
  Update scan and last network info in the WorkThread

Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
 2016-04-20 18:53:58 +00:00
Sudheer Shanka
df9ecfc587 Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev 2016-04-20 18:04:14 +00:00
Sudheer Shanka
205d10bb13 Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev 2016-04-20 17:50:20 +00:00
Mitchell Wills
cf0875a9b6 Update scan and last network info in the WorkThread 
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.

Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes: 27944510
 2016-04-20 10:34:24 -07:00
Keith Cheung
54f7d9bfaf Include work app in battery optimization settings 
Fix: 23684151

Change-Id: I857b90ecee726f9a3d0d67eed944c8fffc668b2e
 2016-04-20 18:02:10 +01:00