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

181975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
6d72d46b4b am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
  Ellipsize QS detail items when needed
 2015-02-05 19:39:18 +00:00
Alan Viverette
f1a4d0e864 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()
 2015-02-05 19:39:14 +00:00
Adam Lesinski
967439b4d1 Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 2015-02-05 19:27:00 +00:00
Dianne Hackborn
5c2fdc331f Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 2015-02-05 19:26:32 +00:00
Jason Monk
3bbc5a1134 Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 2015-02-05 19:19:43 +00:00
Alan Viverette
f15f6a5087 Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 2015-02-05 19:16:58 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable 
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
 2015-02-05 11:11:03 -08:00
Kenny Guy
a2ced3e879 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
automerge: eeb43fb

* commit 'eeb43fbd61adfc6511528e2e13fd5372a14e2831':
  Only switch user if current user is being wiped
 2015-02-05 18:51:53 +00:00
Adrian Roos
5bb7255454 Merge "Ensure new credentails are valid" 2015-02-05 18:44:15 +00:00
Paul McLean
26bf3ea56e Merge "Add additional info to AudioPort for enum/selection API." 2015-02-05 18:26:56 +00:00
Brian Attwell
dd26b2dd63 Merge "Unhide telecom APIs needed by Contacts" 2015-02-05 18:25:52 +00:00
Wale Ogunwale
6aa20770ac Merge "Make sure window frame fits in the containing frame." 2015-02-05 18:14:48 +00:00
Wale Ogunwale
e93116491e Merge "Fixed NPE when trying to resize stack with no running activity." 2015-02-05 18:14:31 +00:00
Chris Craik
785406c6b9 Merge "Don't try to fully tear down program in terminate()" 2015-02-05 18:02:19 +00:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText() 
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
 2015-02-05 09:58:49 -08:00
John Spurlock
951c04bf4d Merge "Use shared value for default muteable streams." 2015-02-05 17:40:50 +00:00
John Spurlock
24c0518723 Use shared value for default muteable streams. 
Change-Id: Ib8fa7aee3bed83fc26945fd0caf0cbd9f4f8af3a
 2015-02-05 12:30:36 -05:00
Chris Craik
3472568774 Don't try to fully tear down program in terminate() 
bug:19277550

The program will be destroyed anyway by nature of the program cache cleanup.

Change-Id: I304becd34fdf40baf314bae8b37d2c072ad44409
 2015-02-05 09:27:23 -08:00
Jason Monk
867874b06a Ellipsize QS detail items when needed 
Bug: 19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2
 2015-02-05 11:54:58 -05:00
Wale Ogunwale
0e1621850b Fixed NPE when trying to resize stack with no running activity. 
Change-Id: If5b6a1110aa8a615def97c9707364e0cc12f4b39
 2015-02-05 08:48:34 -08:00
Kenny Guy
eeb43fbd61 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped
 2015-02-05 15:26:09 +00:00
Narayan Kamath
3ec5f97ac5 Merge "Conditionally include org.apache.http.legacy in app classpaths." 2015-02-05 12:45:24 +00:00
Kenny Guy
8d12d3da15 Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 2015-02-05 12:34:45 +00:00
Narayan Kamath
e2d2ed4923 Conditionally include org.apache.http.legacy in app classpaths. 
bug: 18027885

Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
 2015-02-05 12:10:06 +00:00
Yohann Roussel
de873a64c8 Merge "Adapt to change of LOCAL_USE_JACK values" 2015-02-05 11:01:36 +00:00
Yohann Roussel
f50a51fb4c Adapt to change of LOCAL_USE_JACK values 
Also remove depency to the dx main dex list when building with
Jack.

Change-Id: I13e45dc8406a6a71309d151bf1542b1296c17792
 2015-02-05 10:11:34 +01:00
Alan Viverette
323d888b64 am eeb69d17: Move layer-list to be top-level element in seek bar progress automerge: bac8e12 automerge: 6708ac4 
* commit 'eeb69d171b4023e92fb729bf61d566540bdd5220':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:50:28 +00:00
Zhijun He
d7c32e4843 am 1350671f: am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev automerge: 6bafb86 
* commit '1350671f406c238439e1dc4378287bd422aaf636':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:50:18 +00:00
Alan Viverette
eeb69d171b Move layer-list to be top-level element in seek bar progress automerge: bac8e12 
automerge: 6708ac4

* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:45:31 +00:00
Zhijun He
1350671f40 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:44:01 +00:00
Alan Viverette
6708ac40f2 Move layer-list to be top-level element in seek bar progress 
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:35:27 +00:00
Alan Viverette
77ad055957 am c2bf7440: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 automerge: a638c44 
* commit 'c2bf7440ba9e3484d37d9c5df2ef02710682b7ed':
  Allow top-level drawable container in progressDrawable
 2015-02-05 02:53:52 +00:00
Alan Viverette
29d267c7b3 am fcce8e1a: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957 automerge: f89e06f 
* commit 'fcce8e1a8250681bdbdb31301660036c170a8d57':
  Replace ic_clear with vector icon
 2015-02-05 02:53:46 +00:00
Yang Ni
bacbb8f378 am b457258b: am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit 'b457258b5adc76989e39fe5f3e63781d4ee47576':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:41:47 +00:00
Lorenzo Colitti
0aa7a1ca8e am b43e74bb: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit 'b43e74bbce46f2f328e2031a7ae3447f415ef9ca':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:41:31 +00:00
Alan Viverette
c2bf7440ba Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
  Allow top-level drawable container in progressDrawable
 2015-02-05 02:39:32 +00:00
Alan Viverette
fcce8e1a82 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957 
automerge: f89e06f

* commit 'f89e06fa58c08ff550a69b268832a2ea338b8700':
  Replace ic_clear with vector icon
 2015-02-05 02:38:25 +00:00
Yang Ni
b457258b5a am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit 'da91dfbdf20271dffce5357195800cf36183ad97':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:31:46 +00:00
Lorenzo Colitti
b43e74bbce am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:31:40 +00:00
Yang Ni
da91dfbdf2 am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit '1269ff961000c726247d510762e42b21562b8c2b':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:24:35 +00:00
Lorenzo Colitti
12b26c1248 am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '21702263d96341bc13420e2c74af9a4bec6c7907':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:24:31 +00:00
Zhijun He
6bafb86655 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 02:15:49 +00:00
George Mount
efee230fe1 am 8e7c154b: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c automerge: 23eef1e 
* commit '8e7c154b07162fd91a5db1150f097606fb93f6c4':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 02:12:42 +00:00
Miao Wang
6a84f3d828 am 4bd2c00d: Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc automerge: 58fd96c 
* commit '4bd2c00d8d27d37c5e90a42ec2e39dd9fdd149eb':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 02:12:23 +00:00
Brian Attwell
ad147f4b59 Unhide telecom APIs needed by Contacts 
* Removed @SystemApi and @hide from some telecom classes
  and APIs
* Stopped using explicit @link's to ConnectionService, so
  that I didn't need to unhide ConnectionService
* Added @SystemApi to hidden methods inside classes that
  I removed @SystemApi from.
* Ran update-api. This picked up unrelated Math changes
  from b/11388705.

Unbundling

Bug: 18777272
Bug: 11388705
Change-Id: I218e0c3c0ae515d3deb2d3b67657db45a0bad999
 2015-02-04 18:04:17 -08:00
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust. 
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
 2015-02-04 17:26:17 -08:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress 
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
 2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 01:13:06 +00:00
Alan Viverette
f89e06fa58 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
automerge: 721a957

* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 01:11:28 +00:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00