Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
211,601 Commits 3 Branches 0 Tags
eeea0d92a6b25910cc1cb6aec054faecfd2daf7a
Commit Graph

52021 Commits

Author SHA1 Message Date
Adam Lesinski
e789fc02ae am c852a3e3: am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'c852a3e39c1bbb112e2705edc6714b6b687cb55d':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 21:28:51 +00:00
Adam Lesinski
c852a3e39c am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'eb694bb6e69dd382e9ed114dde604c6a0942c3c2':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 20:12:44 +00:00
Adam Lesinski
546909c990 am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:56:38 +00:00
Adam Lesinski
479c482ca1 am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 19:47:54 +00:00
Adam Lesinski
504600bb09 Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Alan Viverette
74fbf8795c Merge "Add accessors for TabWidget strip drawables" 2015-08-14 17:58:43 +00:00
Alan Viverette
d78036bbec Add accessors for TabWidget strip drawables 
Change-Id: Ia6aef6a2221096c2653ae39fcec60289fa0ee2fb
 2015-08-14 13:53:56 -04:00
Chris Tate
848dd4bfc9 am 14e12258: am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '14e122582c45e236bf2e4c59d10438816f2eed09':
  Make "Ask every time" actually work that way
 2015-08-14 17:44:39 +00:00
Chris Tate
14e122582c am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '13845aeae3fc3044f3fc279ca421df6d4f78ee35':
  Make "Ask every time" actually work that way
 2015-08-14 17:35:28 +00:00
Chris Tate
b2d4c5507f am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit 'b47890c4e7a7fc119e74da2b50bf94c2cf172916':
  Make "Ask every time" actually work that way
 2015-08-14 17:21:52 +00:00
Chris Tate
b47890c4e7 am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
  Make "Ask every time" actually work that way
 2015-08-14 17:15:37 +00:00
Chris Tate
7e7d79ef2f Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:30 +00:00
Alan Viverette
6bfab4e49f Merge "Clean up TabWidget" 2015-08-14 16:15:10 +00:00
Svetoslav Ganov
99ba7ad73c am f6401419: am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'f64014195b6d7bdc2f4d79f3c4c71de16d2fe338':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:44:14 +00:00
Svetoslav Ganov
f64014195b am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '340314fd0306f24fe8e4047b8feede071aadfb97':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:36:40 +00:00
Alan Viverette
7eb09d15cc Clean up TabWidget 
No functional changes, just refactoring and cleaning up comments.

Actually, just one functional change so that setting the tab strip to
@empty will actually remove the tab strip drawable. This makes it
consistent with passing null to the accessor method.

Change-Id: I6f5ba8bea4e8b30117de5f12a86957e995812cfe
 2015-08-14 11:36:01 -04:00
Svetoslav Ganov
7c3d595a3d am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:19:47 +00:00
Svetoslav Ganov
4b655fd193 am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:13:38 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Adam Lesinski
621e06a64d Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs 
System UIDs are also run as shared GIDs, so this should not throw
an exception.

Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
 2015-08-13 22:06:31 -07:00
Jeff Sharkey
c2f61b7798 am e7ed65eb: am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'e7ed65eb45902123463e7100c261062752587bfd':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:29:06 +00:00
Wei Liu
06db906b1d am b8a1747b: am ddd3e323: am d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev 
* commit 'b8a1747b6dd3936bc10834f4c3aa1674bfe1bfb6':
  Add a setting to enable cellular on boot.
 2015-08-14 03:28:46 +00:00
Jeff Sharkey
e7ed65eb45 am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit '4efd3f26ac515f85adde2979ec1d8d68218fc470':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:19:00 +00:00
Wei Liu
b8a1747b6d am ddd3e323: am d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev 
* commit 'ddd3e323c4cefb8994dd5f2927ea9c11dbc5cfd2':
  Add a setting to enable cellular on boot.
 2015-08-14 03:18:22 +00:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way 
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
 2015-08-13 18:56:05 -07:00
Jeff Sharkey
d28991a5e4 am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:35:40 +00:00
Jeff Sharkey
b6f5bcd0c6 am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:24:44 +00:00
Jeff Sharkey
cfcf6af915 Merge "Method to show DialogFragment allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss. 
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
 2015-08-13 16:57:29 -07:00
Wei Liu
d6fb8958d2 Merge "Add a setting to enable cellular on boot." into cw-e-dev 2015-08-13 22:35:43 +00:00
Alan Viverette
02e8c2d418 Merge "Rebase system theme on configuration change" 2015-08-13 20:06:18 +00:00
Chong Zhang
055f9e1772 Merge "Handle activity launch for background users" 2015-08-13 20:04:19 +00:00
Chong Zhang
45c25ceb3a Handle activity launch for background users 
- When launching activities in background, do not move the
  target stack to front or resume the top activity, it should
  have no observable effect to current user.

- Add the launched background task to recents so that they
  can be found when the background user becomes current.

- Keep track of the last accessed stack for background user,
  so that we know which stack to start with when that user goes
  current

bug: 22929608

Change-Id: I0421a6b490251503df7a7e71465b8aae5138eb2d
 2015-08-13 11:29:51 -07:00
Michael Wright
df10f498b9 Merge "Add new media navigation keys." 2015-08-13 15:55:41 +00:00
Michael Wright
962c9532a1 Add new media navigation keys. 
Bug: 22059484
Change-Id: Idfe7fc5dd12acafc9f05c815d8aa7911cfcc7e4b
 2015-08-13 16:44:27 +01:00
Stefan Kuhne
01da2fc7df Merge "Adding API to access / change the task bounds" 2015-08-13 15:40:08 +00:00
Skuhne
ce2faa5871 Adding API to access / change the task bounds 
Bug: 21738328
Change-Id: I3aabcbe1dcc5caa70f66554157f41fbfacf4c50f
 2015-08-13 08:31:43 -07:00
Alan Viverette
eff1b7175d Merge "Add popup theme to AutoCompleteTextView, clean up constructor" 2015-08-13 13:29:19 +00:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework 
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
 2015-08-12 21:57:59 -07:00
Roozbeh Pournader
692adf6ae6 Merge "Fix unintentional NPE in SpannableStringBuilder." 2015-08-13 04:41:48 +00:00
Roozbeh Pournader
cd217b8ace Fix unintentional NPE in SpannableStringBuilder. 
Previously, when getSpans() was called with a null parameter, an
unintentional NullPointerException would be thrown.

Now, we explicitly return an empty array of Objects.

Bug: 19805521
Change-Id: I52f3ae08c2bcf62f6a4d0c01f0fe08ad1134abb8
 2015-08-12 20:14:43 -07:00
Roozbeh Pournader
5e9ed365ad Support strikethrough text in Html.fromHtml(). 
All the three tags, <del>, <s>, and <strike> are now converted to
strikethrough text.

Bug: 21025743
Change-Id: I62dc9793223e266f6e2181169766fde8be0e2aa7
 2015-08-12 19:34:47 -07:00
Dianne Hackborn
d38e7c9387 am 1dd2f5a3: am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 02:10:15 +00:00
Dianne Hackborn
1dd2f5a3eb am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:18:13 +00:00
Dianne Hackborn
a54d4583ec am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '9512a857454d761b53f46958733ba23216c41e64':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:02:26 +00:00
Dianne Hackborn
9512a85745 am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:35 +00:00
Dianne Hackborn
ff9912d594 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:59 +00:00
Deepanshu Gupta
8d38e7c905 Merge "Add StyleableRes annotation to TypedArray." 2015-08-13 00:25:54 +00:00
Dianne Hackborn
c3f7449517 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
 2015-08-12 16:10:58 -07:00
Raph Levien
8cf6d865cf am d202d15d: am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'd202d15d9e4845537c4409c9880eb269b2b59129':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:40:58 +00:00