Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,787 Commits 3 Branches 0 Tags
de99f4a2347a8cd5ac360097709bbe2f5ea33545
Commit Graph

150787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
de99f4a234 am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit 'b9095bacc3083610412757a50a2a1b4cea20f866':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 19:56:56 +00:00
Adam Lesinski
5e71b3fa90 am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit '247e8e84ec0cafcac7f5e686b68ff64cebf7272a':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 19:56:52 +00:00
Adam Lesinski
d06cd2b1bd Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 2014-08-29 19:43:30 +00:00
Adam Lesinski
25b09837d1 Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40 Revert "Make UsageStats API comply with API Council" 
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.

Did not update current.txt

Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
 2014-08-29 19:34:09 +00:00
Adam Lesinski
d79e33379d Clean up test allocations so real memory leaks are more visible 
Change-Id: Ic405f08c8d8e3e7fc4e4a991671e980752c19899
 2014-08-29 12:29:31 -07:00
Adam Lesinski
fc66c98750 am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '84b95b6634be81d9368f13c38ab86d28f591c478':
  Make UsageStats API comply with API Council
 2014-08-29 19:06:29 +00:00
Adam Lesinski
a496b1a7f3 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 18:56:24 +00:00
Adam Lesinski
093c6fa595 am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit 'c169c888039536e5f2393b245465a6dc53c4c2aa':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 18:48:51 +00:00
Adam Lesinski
5283faba4a Change platformBuildVersionCode to name in aapt dump badging 
Change-Id: Ie3972105b3f6a727682f91851f7a99b05bb28e1a
 2014-08-29 11:27:00 -07:00
Yin-Chia Yeh
74df3591a5 am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit '4c99af79c66ce92bee559fd160df75d09cdb90ee':
  Camera2: Remove spurious warnings
 2014-08-29 18:09:32 +00:00
Igor Murashkin
d76275c4b3 am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit '0a843da82f421032af9b05447013d9aaf67f1fee':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 18:09:27 +00:00
John Reck
12bfad8dd9 am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit 'ff6feadefb5fa002a80fd70a5ae7b527f72eef5a':
  Listener callbacks ordering fixups
 2014-08-29 18:09:22 +00:00
Yin-Chia Yeh
3e294e9921 Merge "Camera2: Remove spurious warnings" into lmp-dev 2014-08-29 18:02:50 +00:00
Igor Murashkin
0d1227d8b9 Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 2014-08-29 18:00:39 +00:00
John Reck
7da70ed6a5 Merge "Listener callbacks ordering fixups" into lmp-dev 2014-08-29 17:59:24 +00:00
John Reck
4d2c47206a Listener callbacks ordering fixups 
Bug: 17228458
Bug: 17317816

Ensure that onStart is called prior to onCancel/onFinished if those
happen prior to the UI-thread handled start delay.

Ensure that onFinished is called if cancel/end is called

Change-Id: I23c16ea1c4f925d59d41ec5281d62dfc0c38595b
 2014-08-29 10:40:56 -07:00
Yin-Chia Yeh
d47699a47a Camera2: Remove spurious warnings 
It is valid if all compenents of a synthetic key are null.
Don't warn in that case.

Bug: 17300101

Change-Id: Ifacf2fb56d1272b33a2b1ae377a85c9011e22b24
 2014-08-29 17:39:30 +00:00
Nancy Chen
030d48364c am 70475de3: Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 
* commit '70475de32f0c323082610eb177d0f45b1697c3ee':
  Hide AIDL for RemoteServiceCallback in telecomm
 2014-08-29 17:21:42 +00:00
John Reck
eb50b8578d am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '09a0c7c8d511b8600d2a062d96c0e816a2aee761':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 17:15:58 +00:00
Svetoslav
5e843ee6ac am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev 
* commit '37f72488ecb7a978ccaa77f0b74956a399a755fc':
  Fix the global gesture to enable accessibility.
 2014-08-29 17:15:49 +00:00
Lorenzo Colitti
b4497fdc90 am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '8a44b09de35285f6f02430442a2a62a11563e366':
  Really remove NetworkBoundURLFactory.
 2014-08-29 17:15:44 +00:00
Selim Cinek
64bdd35340 am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit '702d4abba6e2b00c34529ddc757018b6b8e17fe1':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 17:15:39 +00:00
Jorim Jaggi
9acdc4a37c am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit '4c1f1f87943c3694df9fb541939c1a08decf070b':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 17:15:34 +00:00
Nancy Chen
551056ec0f Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 2014-08-29 17:14:54 +00:00
John Reck
4450c18e15 Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 2014-08-29 17:09:50 +00:00
Svetoslav
074d27dd5d Merge "Fix the global gesture to enable accessibility." into lmp-dev 2014-08-29 17:09:49 +00:00
John Reck
dff9957cc2 Free prefetched layers on TRIM_MEMORY 
Bug: 17208461

Change-Id: I831c10d29d5920274b90e11a67d6cd106972a058
 2014-08-29 09:59:43 -07:00
Lorenzo Colitti
e37679b27d Merge "Really remove NetworkBoundURLFactory." into lmp-dev 2014-08-29 16:54:20 +00:00
Jorim Jaggi
c6d25c9b89 am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit '5224a3f29ac75dc0c9493bc45fa593dde8872b8d':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 16:47:53 +00:00
Jorim Jaggi
7a79b33039 am 35d00b45: Update paddings for more card to match notification layouts 
* commit '35d00b452b8417d920f855b914559695a3a73d79':
  Update paddings for more card to match notification layouts
 2014-08-29 16:47:48 +00:00
Selim Cinek
e73a0a0195 Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 2014-08-29 16:44:23 +00:00
Jorim Jaggi
497e699553 Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 2014-08-29 16:42:59 +00:00
Jorim Jaggi
b5428e16cd Revert "Content description for padlock icon depending on state" 
This reverts commit 1518196a94ed006b2b45e5dc527a23721ec1147a.

It turned out that just "Unlock" is a better label there, as
announcing the state might be confusing.

Bug: 17255298
Change-Id: I13f3b3db68f3f96afcd4db33baf07e7e213aa12c
 2014-08-29 18:42:32 +02:00
Jorim Jaggi
2cf8b71e14 Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 2014-08-29 16:42:01 +00:00
Jorim Jaggi
2c33d5dcae Only dismiss Keyguard with space when screen is on 
Bug: 17206291
Change-Id: I7fd9c77a0810bb71c0e4193ab121398e8e78d43b
 2014-08-29 18:41:03 +02:00
Jorim Jaggi
6b58ab5809 Update paddings for more card to match notification layouts 
Bug: 15437369
Change-Id: I6e9b1ce420d1d7217a455519a746ad28ed1fa75d
 2014-08-29 16:40:06 +00:00
Selim Cinek
9f6ceb1d1c Increasing the delay for the volume warning dialog with talkback 
Bug: 17145793
Change-Id: I27eb9c46c8d73d5e475f97b50b0a2f219c4ed6fb
 2014-08-29 16:28:39 +02:00
Jorim Jaggi
b30c615ff2 am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev 
* commit '99a9436c4f76e00750e62d180e48644ea2e60a83':
  Fix various problems with notification layouts
 2014-08-29 14:00:51 +00:00
Jorim Jaggi
e11ac78ccd Merge "Fix various problems with notification layouts" into lmp-dev 2014-08-29 13:51:23 +00:00
Neil Fuller
0ecef43e39 am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 
* commit '245eaa25b3c9349660a6e24cd2d0e46a7b3381b4':
  Fixing android.text.format.Time for non-English locales
 2014-08-29 13:49:03 +00:00
Neil Fuller
7e19fb0d69 Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 2014-08-29 13:36:02 +00:00
Jorim Jaggi
d05aa3ee47 Fix various problems with notification layouts 
- Fix end padding for inbox notification.
- Fix that actions in BigText were clipped off.
- Fix that second line was never shown.
- Fix top padding in combination with badges.
- Fix that actions in InboxStyle were clipped off.
- Make badge style consistent with small icon.
- Fix that third line on Inbox/BigText is always 12sp (before it was
  sometimes 14sp)

Bug: 17315502
Bug: 17285898
Bug: 17311783
Bug: 17200814
Change-Id: Ic7e5e4fa07b6302a76631d0238b88239871acf49
 2014-08-29 15:26:50 +02:00
Neil Fuller
16566656cd Fixing android.text.format.Time for non-English locales 
The test fixes for bug 17262063 showed up a real issue for
non-English locales with the Time.format() method:
If the Android string resources that contain the pattern use
non-ASCII characters then a '?' would be output instead of
those characters.

For example, in France the pattern for '%c' includes a 'à'
(a with a grave accent) and Japan includes 日.

The problem was due to converting the pattern to bytes using
the US_ASCII character set, which turns non-ASCII characters
into '?'. The code has been changed to use char throughout
and avoid bytes.

Internal documentation has been improved.

Some calls to modifyAndAppend() have been replaced with a
direct call to outputBuilder.append() because the
modify step is guaranteed to a no-op for the literals given.

The formatter has been changed to use Locale.US because it
is only used for outputting numbers. It has been renamed
to make this more obvious and the locale field has been
removed.

Bug: 17262063

(cherry picked from commit 788cb18f65)

Change-Id: I96ee158fbeb01827f0bbf022631625416f872fdb
 2014-08-29 14:10:35 +01:00
Kenny Guy
4f9cbd2a2b am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit '21e106f8c1578767a829bd8895b8d101af3b4f8d':
  Load ApplicationInfo for correct user.
 2014-08-29 11:10:09 +00:00
Kenny Guy
d5936307fb Merge "Load ApplicationInfo for correct user." into lmp-dev 2014-08-29 11:01:04 +00:00
Yohei Yukawa
0f93377382 am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev 
* commit 'bbee6bebdc6d03eb3202c3c4e63e42473be98edc':
  Reject request when any unknown flag is speficied
 2014-08-29 09:19:14 +00:00
Yohei Yukawa
1728879d9c Merge "Reject request when any unknown flag is speficied" into lmp-dev 2014-08-29 08:22:58 +00:00
Yohei Yukawa
72d35fa829 Reject request when any unknown flag is speficied 
Currently EditableInputConnection#requestUpdateCursorAnchorInfo
never returns false unless InputMethodManager is somehow
unavailable.

This is problematic, especifially when we add a new flag to
EditableInputConnection#requestUpdateCursorAnchorInfo in a
future release.

With this CL, #requestUpdateCursorAnchorInfo does nothing and
immediately returns false when one ore more unknown bits are
specified.

BUG: 17324806
Change-Id: I5601714b481e8efa0ad3337c0d093cfcf55eade3
 2014-08-29 00:57:19 -07:00
Jeff Sharkey
232802e0e5 am f1ddfd1e: Keep tests building. 
* commit 'f1ddfd1ea8773c409a3541f279f1d3c87e010f9c':
  Keep tests building.
 2014-08-29 07:36:48 +00:00