Alan Viverette
b989c5561e
resolve merge conflicts of da9653a to master.
...
Change-Id: I7458452389fb7b048fe5c6daa375fd4dbb9d9766
2015-02-05 17:10:47 -08:00
Alan Viverette
cbe32de454
am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
...
automerge: 80b381c
2015-02-06 00:53:09 +00:00
Alan Viverette
80b381c073
am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
...
* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
Mutate scroll bar drawables
2015-02-06 00:25:33 +00:00
Alan Viverette
9a166c7da3
Merge "Mutate scroll bar drawables" into lmp-mr1-dev
2015-02-06 00:19:44 +00:00
Filip Gruszczynski
fe7712e758
am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
...
automerge: 96f3462
2015-02-06 00:16:41 +00:00
Filip Gruszczynski
3f579c7167
am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev
...
automerge: 943c09d
2015-02-06 00:15:12 +00:00
Filip Gruszczynski
96f3462958
am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
...
* commit '7acd679cb3f3c543ad71aaeb1057bcbef3a880e5':
Add wallpaper controlling system apis.
2015-02-06 00:09:41 +00:00
Filip Gruszczynski
943c09d720
am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev
...
* commit '00de5c9f04e42045bd0299c06a9cc05187b1dff0':
Add hidden shutdown method to PowerManager.
2015-02-06 00:09:35 +00:00
Alan Viverette
f8512ce081
Mutate scroll bar drawables
...
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
2015-02-05 15:58:56 -08:00
Filip Gruszczynski
7acd679cb3
Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev
2015-02-05 23:19:01 +00:00
Filip Gruszczynski
00de5c9f04
Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev
2015-02-05 23:18:41 +00:00
John Spurlock
14a9f9cac7
am c46b68c7: am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. automerge: 29fabd8
...
* commit 'c46b68c7a230847cd5a459d7fec5a5649f5c6d67':
Fix a few typos in Parcel.java.
2015-02-05 23:16:41 +00:00
Ruben Brunk
7bf20e4791
am 78ee9807: am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev automerge: 2a11473
...
* commit '78ee9807387e87714c74e6944d538409e0677b74':
camera2: Make legacy error handling more robust.
2015-02-05 23:16:36 +00:00
Adam Lesinski
9a647096ac
am 88c5abb3: am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev automerge: abc88d0
...
* commit '88c5abb33f0e306a8add10fcef90733aa205799e':
Make ArrayMap.EMPTY immutable
2015-02-05 23:16:31 +00:00
John Spurlock
c46b68c7a2
am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
...
automerge: 29fabd8
2015-02-05 23:08:51 +00:00
Alan Viverette
688ecaa7b9
am 00a1fa3e: am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev automerge: f1a4d0e
...
* commit '00a1fa3e433d333c58156ff4f1ede086b6ab0a09':
Invalidate SubtitleView during setText()
2015-02-05 23:07:34 +00:00
Ruben Brunk
78ee980738
am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
...
automerge: 2a11473
2015-02-05 23:07:13 +00:00
Adam Lesinski
88c5abb33f
am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
...
automerge: abc88d0
2015-02-05 23:05:40 +00:00
Alan Viverette
00a1fa3e43
am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
...
automerge: f1a4d0e
2015-02-05 23:00:44 +00:00
John Spurlock
29fabd8988
am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
...
* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
Fix a few typos in Parcel.java.
2015-02-05 20:47:23 +00:00
John Spurlock
9adf1c5422
am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
...
* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
Fix a few typos in Parcel.java.
2015-02-05 20:39:36 +00:00
Filip Gruszczynski
9fedc72a0b
Add wallpaper controlling system apis.
...
Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211
2015-02-05 12:29:42 -08:00
John Spurlock
ac7b9dd39f
am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
...
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
Fix a few typos in Parcel.java.
2015-02-05 20:27:59 +00:00
Ruben Brunk
2a114737c6
am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
...
* commit 'cd0d7cdefef0dbf395e5b159dccb6e884a2077b7':
camera2: Make legacy error handling more robust.
2015-02-05 20:19:55 +00:00
John Spurlock
42d3b66f48
am e0852368: Fix a few typos in Parcel.java.
...
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
Fix a few typos in Parcel.java.
2015-02-05 20:18:03 +00:00
Filip Gruszczynski
d05af86e6e
Add hidden shutdown method to PowerManager.
...
Bug: 17420540
We need to be able to shutdown some of wearable devices programatically.
We should be able to do it by connecting to PowerManagerService directly,
but it would be nice to go through the official interface.
Change-Id: Id0cf3b36c03447356fc60fb90cbb2f4b47d8265e
2015-02-05 12:12:43 -08:00
Ruben Brunk
cd0d7cdefe
Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
2015-02-05 19:54:37 +00:00
Adam Lesinski
abc88d0743
am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
...
* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
Make ArrayMap.EMPTY immutable
2015-02-05 19:39:27 +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
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
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
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
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
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
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
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
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
c2bf7440ba
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9
...
automerge: a638c44
2015-02-05 02:39:32 +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
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
2015-02-05 01:13:06 +00:00
Zhijun He
81c8018031
Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
2015-02-05 01:10:29 +00:00
Alan Viverette
80252a92e5
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
2015-02-05 00:47:17 +00:00
